From: <sl...@ke...> - 2010-03-16 14:12:58
|
Module: gst-plugins-good Branch: master Commit: ef8f7614ff77ed9ce8979ebdbb96032ba768701d URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=ef8f7614ff77ed9ce8979ebdbb96032ba768701d Author: Jan Urbański <wu...@wu...> Date: Tue Mar 16 00:35:46 2010 +0100 flvmux: Remove the send_codec_data field from GstFlvPad That field is not used anymore after the changes in 9fdecbc1c11f4e5af6578bba32a9b32771029d33. --- gst/flv/gstflvmux.c | 18 ++---------------- gst/flv/gstflvmux.h | 1 - 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c index 505e0c2..9250ffd 100644 --- a/gst/flv/gstflvmux.c +++ b/gst/flv/gstflvmux.c @@ -301,14 +301,8 @@ gst_flv_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps) if (ret && gst_structure_has_field (s, "codec_data")) { const GValue *val = gst_structure_get_value (s, "codec_data"); - if (val) { + if (val) cpad->video_codec_data = gst_buffer_ref (gst_value_get_buffer (val)); - cpad->sent_codec_data = FALSE; - } else { - cpad->sent_codec_data = TRUE; - } - } else { - cpad->sent_codec_data = TRUE; } gst_object_unref (mux); @@ -455,14 +449,8 @@ gst_flv_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps) if (ret && gst_structure_has_field (s, "codec_data")) { const GValue *val = gst_structure_get_value (s, "codec_data"); - if (val) { + if (val) cpad->audio_codec_data = gst_buffer_ref (gst_value_get_buffer (val)); - cpad->sent_codec_data = FALSE; - } else { - cpad->sent_codec_data = TRUE; - } - } else { - cpad->sent_codec_data = TRUE; } gst_object_unref (mux); @@ -525,8 +513,6 @@ gst_flv_mux_request_new_pad (GstElement * element, cpad->video_codec = G_MAXUINT; cpad->video_codec_data = NULL; - cpad->sent_codec_data = FALSE; - cpad->last_timestamp = 0; /* FIXME: hacked way to override/extend the event function of diff --git a/gst/flv/gstflvmux.h b/gst/flv/gstflvmux.h index 1af6530..27de8bb 100644 --- a/gst/flv/gstflvmux.h +++ b/gst/flv/gstflvmux.h @@ -52,7 +52,6 @@ typedef struct guint video_codec; GstBuffer *video_codec_data; - gboolean sent_codec_data; GstClockTime last_timestamp; } GstFlvPad; |