diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-16 14:33:20 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-16 14:33:20 +0100 |
| commit | 2fca270f1956fa3379ebca02203e3f95ae8aba42 (patch) | |
| tree | 8ae2bb3e039698f88e6ba73240db9f0b8268d6ba /gst/mve | |
| parent | c7216162e4b8bf1b9988c8b0977a57aecbae6b42 (diff) | |
| parent | 2ce709cf4a4d46b058218a965885cecfa1568b1f (diff) | |
| download | gstreamer-plugins-bad-2fca270f1956fa3379ebca02203e3f95ae8aba42.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/tsdemux.c
gst/mve/gstmvedemux.c
Diffstat (limited to 'gst/mve')
| -rw-r--r-- | gst/mve/gstmvedemux.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gst/mve/gstmvedemux.c b/gst/mve/gstmvedemux.c index a101a9059..9851e68eb 100644 --- a/gst/mve/gstmvedemux.c +++ b/gst/mve/gstmvedemux.c @@ -713,7 +713,7 @@ gst_mve_audio_init (GstMveDemux * mve, guint8 version, const guint8 * data, if (gst_mve_add_stream (mve, stream, list)) return gst_pad_push_event (mve->audio_stream->pad, gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, - 0, GST_CLOCK_TIME_NONE, 0)); + 0, GST_CLOCK_TIME_NONE, 0)) ? GST_FLOW_OK : GST_FLOW_ERROR; else return GST_FLOW_OK; } @@ -866,7 +866,7 @@ gst_mve_timer_create (GstMveDemux * mve, const guint8 * data, guint16 len, if (gst_mve_add_stream (mve, s, list)) return gst_pad_push_event (s->pad, gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, - 0, GST_CLOCK_TIME_NONE, 0)); + 0, GST_CLOCK_TIME_NONE, 0)) ? GST_FLOW_OK : GST_FLOW_ERROR; else return GST_FLOW_OK; } @@ -1090,12 +1090,10 @@ gst_mve_demux_base_init (GstMveDemuxClass * klass) GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&vidsrc_template)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&audsrc_template)); + gst_element_class_add_static_pad_template (element_class, &sink_template); + gst_element_class_add_static_pad_template (element_class, &vidsrc_template); + gst_element_class_add_static_pad_template (element_class, &audsrc_template); + gst_element_class_set_details_simple (element_class, "MVE Demuxer", "Codec/Demuxer", "Demultiplex an Interplay movie (MVE) stream into audio and video", |