diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2008-09-03 00:07:34 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2008-09-03 00:07:34 +0000 |
| commit | 15995030431fe498293442e709becf6e1ba1f5b4 (patch) | |
| tree | b8cfcc2c1af84382369dbf9478a987edbe722c83 | |
| parent | 79d5045d33db3abdf6d18e6ed650d3a7025e19ba (diff) | |
| download | ffmpeg-streaming-15995030431fe498293442e709becf6e1ba1f5b4.zip ffmpeg-streaming-15995030431fe498293442e709becf6e1ba1f5b4.tar.gz | |
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
| -rw-r--r-- | libavformat/rmdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 6414fa7..cb3863b 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; |
