RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Ronald S. Bultje 2008-09-03 00:07:34 +00:00
parent 79d5045d33
commit 1599503043
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rmdec.c
View File

@ -197,6 +197,7 @@ ff_rm_read_mdpr_codecdata (AVFormatContext *s, AVStream *st, int codec_data_size
int size; int size;
int64_t codec_pos; int64_t codec_pos;
av_set_pts_info(st, 64, 1, 1000);
codec_pos = url_ftell(pb); codec_pos = url_ftell(pb);
v = get_be32(pb); v = get_be32(pb);
if (v == MKTAG(0xfd, 'a', 'r', '.')) { 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)); /* desc */
get_str8(pb, buf, sizeof(buf)); /* mimetype */ get_str8(pb, buf, sizeof(buf)); /* mimetype */
st->codec->codec_type = CODEC_TYPE_DATA; 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) if (ff_rm_read_mdpr_codecdata(s, st, get_be32(pb)) < 0)
return -1; return -1;
break; break;