Mercurial > libavformat.hg

changeset 1825:12c820d450aa libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove nonsense time base code, use swf ms per frame, only video frames contains pts
author bcoudurier
date Thu, 01 Mar 2007 16:59:59 +0000
parents 9e1fecae7f80
children 6d90aa8be34b
files swf.c
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/swf.c	Thu Mar 01 16:40:48 2007 +0000
+++ b/swf.c	Thu Mar 01 16:59:59 2007 +0000
@@ -773,13 +773,8 @@
     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 @@
             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 @@
             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;
             }