Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove nonsense time base code, use swf ms per frame, only video frames contains pts

Browse Source 
Originally committed as revision 8174 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Baptiste Coudurier 18 years ago
parent 497244a897
commit dfc1313d28
1 changed files with 3 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      libavformat/swf.c

11
libavformat/swf.c
Unescape View File

@ -773,13 +773,8 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
for(;;) { for(;;) {
tag = get_swf_tag(pb, &len); tag = get_swf_tag(pb, &len);
if (tag < 0) { if (tag < 0) {
if ( ast || vst ) { if ( ast || vst )
if ( vst && ast ) {
vst->codec->time_base.den = ast->codec->sample_rate / swf->samples_per_frame;
vst->codec->time_base.num = 1;
}
break; break;
}
av_log(s, AV_LOG_ERROR, "No media found in SWF\n"); av_log(s, AV_LOG_ERROR, "No media found in SWF\n");
return AVERROR_IO; return AVERROR_IO;
} }
@ -794,7 +789,7 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */ av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */
vst->codec->codec_type = CODEC_TYPE_VIDEO; vst->codec->codec_type = CODEC_TYPE_VIDEO;
vst->codec->codec_id = codec_get_id(swf_codec_tags, get_byte(pb)); vst->codec->codec_id = codec_get_id(swf_codec_tags, get_byte(pb));
if (swf->samples_per_frame) { if (swf->ms_per_frame) {
vst->codec->time_base.den = 1000. / swf->ms_per_frame; vst->codec->time_base.den = 1000. / swf->ms_per_frame;
vst->codec->time_base.num = 1; vst->codec->time_base.num = 1;
} }
@ -824,7 +819,7 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */ av_set_pts_info(vst, 24, 1, 1000); /* 24 bit pts in ms */
vst->codec->codec_type = CODEC_TYPE_VIDEO; vst->codec->codec_type = CODEC_TYPE_VIDEO;
vst->codec->codec_id = CODEC_ID_MJPEG; vst->codec->codec_id = CODEC_ID_MJPEG;
if (swf->samples_per_frame) { if (swf->ms_per_frame) {
vst->codec->time_base.den = 1000. / swf->ms_per_frame; vst->codec->time_base.den = 1000. / swf->ms_per_frame;
vst->codec->time_base.num = 1; vst->codec->time_base.num = 1;
} }

Write Preview
Loading…
Cancel
Save