From dfc1313d28c58e71e24728bca274bfd85151aef2 Mon Sep 17 00:00:00 2001
From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Thu, 1 Mar 2007 16:59:59 +0000
Subject: [PATCH] remove nonsense time base code, use swf ms per frame, only
video frames contains pts
Originally committed as revision 8174 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/swf.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/libavformat/swf.c b/libavformat/swf.c
index 703aa6589c9..3080259ef87 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -773,13 +773,8 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
for(;;) {
tag = get_swf_tag(pb, &len);
if (tag < 0) {
- 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;
- }
+ if ( ast || vst )
break;
- }
av_log(s, AV_LOG_ERROR, "No media found in SWF\n");
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 */
vst->codec->codec_type = CODEC_TYPE_VIDEO;
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.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 */
vst->codec->codec_type = CODEC_TYPE_VIDEO;
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.num = 1;
}
--
GitLab