[FFmpeg-cvslog] rmdec: don't set codec timebase.

Anton Khirnov git at videolan.org
Thu Dec 1 03:02:40 CET 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Nov 28 09:17:46 2011 +0100| [d3e3ffa501beab09ac7c73d10235b372c0311615] | committer: Anton Khirnov

rmdec: don't set codec timebase.

It's not supposed to be set outside of lavc.
Set r_frame_rate instead.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d3e3ffa501beab09ac7c73d10235b372c0311615
---

 libavformat/rmdec.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index e3b3e5a..a13f970 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -332,10 +332,9 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb,
         if ((ret = rm_read_extradata(pb, st->codec, codec_data_size - (avio_tell(pb) - codec_pos))) < 0)
             return ret;
 
-        av_reduce(&st->codec->time_base.num, &st->codec->time_base.den,
+        av_reduce(&st->r_frame_rate.den, &st->r_frame_rate.num,
                   0x10000, fps, (1 << 30) - 1);
-        st->avg_frame_rate.num = st->codec->time_base.den;
-        st->avg_frame_rate.den = st->codec->time_base.num;
+        st->avg_frame_rate = st->r_frame_rate;
     }
 
 skip:



More information about the ffmpeg-cvslog mailing list