Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / ext / dv / gstdvdemux.c

diff --git a/ext/dv/gstdvdemux.c b/ext/dv/gstdvdemux.c
index 467ebe5..d3618ed 100644 (file)
--- a/ext/dv/gstdvdemux.c
+++ b/ext/dv/gstdvdemux.c
@@ -179,11 +179,12 @@ gst_dvdemux_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
-  gst_element_class_add_static_pad_template (element_class, &sink_temp);
-  gst_element_class_add_static_pad_template (element_class,
-      &video_src_temp);
-  gst_element_class_add_static_pad_template (element_class,
-      &audio_src_temp);
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&sink_temp));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&video_src_temp));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&audio_src_temp));
 
   gst_element_class_set_details_simple (element_class,
       "DV system stream demuxer", "Codec/Demuxer",
@@ -1521,7 +1522,7 @@ gst_dvdemux_demux_frame (GstDVDemux * dvdemux, GstBuffer * buffer)
 
   /* check for the end of the segment */
   if (dvdemux->time_segment.stop != -1 && next_ts > dvdemux->time_segment.stop)
-    ret = GST_FLOW_UNEXPECTED;
+    ret = GST_FLOW_EOS;
   else
     ret = GST_FLOW_OK;
 
@@ -1789,7 +1790,7 @@ pause:
     GST_INFO_OBJECT (dvdemux, "pausing task, %s", gst_flow_get_name (ret));
     dvdemux->running = FALSE;
     gst_pad_pause_task (dvdemux->sinkpad);
-    if (ret == GST_FLOW_UNEXPECTED) {
+    if (ret == GST_FLOW_EOS) {
       GST_LOG_OBJECT (dvdemux, "got eos");
       /* perform EOS logic */
       if (dvdemux->time_segment.flags & GST_SEEK_FLAG_SEGMENT) {
@@ -1799,7 +1800,7 @@ pause:
       } else {
         gst_dvdemux_push_event (dvdemux, gst_event_new_eos ());
       }
-    } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) {
+    } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_EOS) {
       /* for fatal errors or not-linked we post an error message */
       GST_ELEMENT_ERROR (dvdemux, STREAM, FAILED,
           (NULL), ("streaming stopped, reason %s", gst_flow_get_name (ret)));