[0.11] gst-plugins-bad: mve: don't return a boolean for a GstFlowReturn

Wim Taymans wtay at kemper.freedesktop.org
Thu Feb 16 05:36:34 PST 2012


Module: gst-plugins-bad
Branch: 0.11
Commit: b3592ebda868fd183304789d8448c21abe517fe9
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=b3592ebda868fd183304789d8448c21abe517fe9

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Thu Feb 16 00:30:05 2012 +0000

mve: don't return a boolean for a GstFlowReturn

fixes playback.

---

 gst/mve/gstmvedemux.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gst/mve/gstmvedemux.c b/gst/mve/gstmvedemux.c
index 8a0cc5c..85d6122 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,9 @@ gst_mve_demux_base_init (GstMveDemuxClass * klass)
 
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
 
-  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_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",



More information about the gstreamer-commits mailing list