From d3e3ffa501beab09ac7c73d10235b372c0311615 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 28 Nov 2011 09:17:46 +0100 Subject: rmdec: don't set codec timebase. It's not supposed to be set outside of lavc. Set r_frame_rate instead. --- libavformat/rmdec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'libavformat/rmdec.c') 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: -- cgit v1.1 From c3f9ebf74371b63fba0e7491e61904bbd165cd0f Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 29 Nov 2011 19:28:15 +0100 Subject: lavf: make av_set_pts_info private. It's supposed to be called only from (de)muxers. --- libavformat/rmdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/rmdec.c') diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index a13f970..66b6f8a 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -23,6 +23,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/dict.h" #include "avformat.h" +#include "internal.h" #include "riff.h" #include "rm.h" @@ -301,7 +302,7 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVIOContext *pb, int64_t codec_pos; int ret; - av_set_pts_info(st, 64, 1, 1000); + avpriv_set_pts_info(st, 64, 1, 1000); codec_pos = avio_tell(pb); v = avio_rb32(pb); if (v == MKTAG(0xfd, 'a', 'r', '.')) { -- cgit v1.1