From 15995030431fe498293442e709becf6e1ba1f5b4 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 3 Sep 2008 00:07:34 +0000 Subject: [PATCH] Move av_set_pts_info() inside the mdpr_read_codecdata() call, so that it is shared between the RM demuxer and the RTSP/RDT parser; both use the same timebase. See discussion in "[PATCH] rmdec.c: move av_set_pts_info()" on ML. Originally committed as revision 15164 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rmdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 6414fa771a..cb3863b8a6 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -197,6 +197,7 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st, int codec_data_size int size; int64_t codec_pos; + av_set_pts_info(st, 64, 1, 1000); codec_pos = url_ftell(pb); v = get_be32(pb); if (v == MKTAG(0xfd, 'a', 'r', '.')) { @@ -349,7 +350,6 @@ static int rm_read_header(AVFormatContext *s, AVFormatParameters *ap) get_str8(pb, buf, sizeof(buf)); /* desc */ get_str8(pb, buf, sizeof(buf)); /* mimetype */ st->codec->codec_type = CODEC_TYPE_DATA; - av_set_pts_info(st, 64, 1, 1000); if (ff_rm_read_mdpr_codecdata(s, st, get_be32(pb)) < 0) return -1; break; -- GitLab