[SCM] libav/experimental: always export videostreams

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:54:46 UTC 2013


The following commit has been merged in the experimental branch:
commit b4bcf81001976ad52f6743e3bf25aabd450703f5
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun Jan 14 00:46:37 2007 +0000

    always export videostreams
    
    Originally committed as revision 7452 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/swf.c b/libavformat/swf.c
index ee0701e..52b7feb 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -792,24 +792,19 @@ static int swf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             return AVERROR_IO;
         }
         if ( tag == TAG_VIDEOSTREAM && !vst) {
-            int codec_id;
             swf->ch_id = get_le16(pb);
             get_le16(pb);
             get_le16(pb);
             get_le16(pb);
             get_byte(pb);
             /* Check for FLV1 */
-            codec_id = codec_get_id(swf_codec_tags, get_byte(pb));
-            if ( codec_id ) {
-                vst = av_new_stream(s, 0);
-                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;
-                if ( swf->samples_per_frame ) {
-                    vst->codec->time_base.den = 1000. / swf->ms_per_frame;
-                    vst->codec->time_base.num = 1;
-                }
+            vst = av_new_stream(s, 0);
+            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) {
+                vst->codec->time_base.den = 1000. / swf->ms_per_frame;
+                vst->codec->time_base.num = 1;
             }
         } else if ( ( tag == TAG_STREAMHEAD || tag == TAG_STREAMHEAD2 ) && !ast) {
             /* streaming found */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list