From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Tue, 10 Jan 2012 10:39:27 +0000 (+0100)
Subject: ffmpeg: Fix merge mistakes
X-Git-Tag: 1.19.3~499^2~984
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=44a1dc013841b54c754f6971905b95fa5aaaf82e;p=platform%2Fupstream%2Fgstreamer.git

ffmpeg: Fix merge mistakes
---

diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index f370e7f..0d9225f 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -491,11 +491,11 @@ gst_ffmpegdec_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
           GstClockTime min_lat, max_lat, our_lat;
 
           gst_query_parse_latency (query, &live, &min_lat, &max_lat);
-          if (ffmpegdec->format.video.fps_n > 0)
+          if (ffmpegdec->out_info.fps_n > 0)
             our_lat =
                 gst_util_uint64_scale_int (ffmpegdec->context->has_b_frames *
-                GST_SECOND, ffmpegdec->format.video.fps_d,
-                ffmpegdec->format.video.fps_n);
+                GST_SECOND, ffmpegdec->out_info.fps_d,
+                ffmpegdec->out_info.fps_n);
           else
             our_lat =
                 gst_util_uint64_scale_int (ffmpegdec->context->has_b_frames *
@@ -510,7 +510,7 @@ gst_ffmpegdec_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
     }
       break;
     default:
-      res = gst_pad_query_default (pad, query);
+      res = gst_pad_query_default (pad, parent, query);
       break;
   }
 
diff --git a/ext/libpostproc/gstpostproc.c b/ext/libpostproc/gstpostproc.c
index 7278a7d..aa05a9f 100644
--- a/ext/libpostproc/gstpostproc.c
+++ b/ext/libpostproc/gstpostproc.c
@@ -371,10 +371,10 @@ gst_post_proc_base_init (GstPostProcClass * klass)
   g_free (longname);
   g_free (description);
 
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_post_proc_src_template);
-  gst_element_class_add_static_pad_template (element_class,
-      &gst_post_proc_sink_template);
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_post_proc_src_template));
+  gst_element_class_add_pad_template (element_class,
+      gst_static_pad_template_get (&gst_post_proc_sink_template));
 
   klass->filterid = ppidx;
 }
diff --git a/gst-libs/ext/libav b/gst-libs/ext/libav
index 0b8b338..85afbb1 160000
--- a/gst-libs/ext/libav
+++ b/gst-libs/ext/libav
@@ -1 +1 @@
-Subproject commit 0b8b3387a977dcdb6fb9e53bcc9966d34b2e4cec
+Subproject commit 85afbb1d00d58812df5d634e946b2fcf653bcd8e