From 28d1c135bb9ce679f735957f95994b6b849ab3ff Mon Sep 17 00:00:00 2001
From: Sebastian Dröge <sebastian@centricular.com>
Date: Fri, 03 Jan 2014 15:25:39 +0000
Subject: avdemux: Stop using r_frame_rate field

It was removed and quite meaningless anyway.
Use the average framerate instead.
---
diff --git a/ext/libav/gstavdemux.c b/ext/libav/gstavdemux.c
index 74e4a39..1e4ef2f 100644
--- a/ext/libav/gstavdemux.c
+++ b/ext/libav/gstavdemux.c
@@ -748,8 +748,8 @@ gst_ffmpegdemux_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
           break;
         case GST_FORMAT_DEFAULT:
           gst_query_set_position (query, GST_FORMAT_DEFAULT,
-              gst_util_uint64_scale (timeposition, avstream->r_frame_rate.num,
-                  GST_SECOND * avstream->r_frame_rate.den));
+              gst_util_uint64_scale (timeposition, avstream->avg_frame_rate.num,
+                  GST_SECOND * avstream->avg_frame_rate.den));
           res = TRUE;
           break;
         case GST_FORMAT_BYTES:
@@ -785,8 +785,8 @@ gst_ffmpegdemux_src_query (GstPad * pad, GstObject * parent, GstQuery * query)
           break;
         case GST_FORMAT_DEFAULT:
           gst_query_set_duration (query, GST_FORMAT_DEFAULT,
-              gst_util_uint64_scale (timeduration, avstream->r_frame_rate.num,
-                  GST_SECOND * avstream->r_frame_rate.den));
+              gst_util_uint64_scale (timeduration, avstream->avg_frame_rate.num,
+                  GST_SECOND * avstream->avg_frame_rate.den));
           res = TRUE;
           break;
         case GST_FORMAT_BYTES:
@@ -865,8 +865,8 @@ gst_ffmpegdemux_src_convert (GstPad * pad,
       switch (*dest_fmt) {
         case GST_FORMAT_DEFAULT:
           *dest_value = gst_util_uint64_scale (src_value,
-              avstream->r_frame_rate.num,
-              GST_SECOND * avstream->r_frame_rate.den);
+              avstream->avg_frame_rate.num,
+              GST_SECOND * avstream->avg_frame_rate.den);
           break;
         default:
           res = FALSE;
@@ -877,8 +877,8 @@ gst_ffmpegdemux_src_convert (GstPad * pad,
       switch (*dest_fmt) {
         case GST_FORMAT_TIME:
           *dest_value = gst_util_uint64_scale (src_value,
-              GST_SECOND * avstream->r_frame_rate.num,
-              avstream->r_frame_rate.den);
+              GST_SECOND * avstream->avg_frame_rate.num,
+              avstream->avg_frame_rate.den);
           break;
         default:
           res = FALSE;
--
cgit v0.9.0.2-2-gbebe