[FFmpeg-cvslog] r15164 - trunk/libavformat/rmdec.c

[rbultje]

Author: rbultje
Date: Wed Sep  3 02:07:34 2008
New Revision: 15164

Log:
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.



Modified:
   trunk/libavformat/rmdec.c

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	(original)
+++ trunk/libavformat/rmdec.c	Wed Sep  3 02:07:34 2008
@@ -197,6 +197,7 @@ ff_rm_read_mdpr_codecdata (AVFormatConte
     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(AVFormatContex
             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;