[libav-commits] swfenc: error out for more than 1 audio or video stream

Janne Grunau git at libav.org
Tue Oct 9 18:48:08 CEST 2012


Module: libav
Branch: master
Commit: 53e122dd4afbb5bbdbba8b18bee0beb460242dc7

Author:    Janne Grunau <janne-libav at jannau.net>
Committer: Janne Grunau <janne-libav at jannau.net>
Date:      Tue Oct  9 14:48:08 2012 +0200

swfenc: error out for more than 1 audio or video stream

Prevents CID602000.

---

 libavformat/swfenc.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c
index 9de8b67..31f405d 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -186,6 +186,10 @@ static int swf_write_header(AVFormatContext *s)
     for(i=0;i<s->nb_streams;i++) {
         AVCodecContext *enc = s->streams[i]->codec;
         if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
+            if (swf->audio_enc) {
+                av_log(s, AV_LOG_ERROR, "SWF muxer only supports 1 audio stream\n");
+                return AVERROR_INVALIDDATA;
+            }
             if (enc->codec_id == AV_CODEC_ID_MP3) {
                 swf->audio_enc = enc;
                 swf->audio_fifo= av_fifo_alloc(AUDIO_FIFO_SIZE);
@@ -196,6 +200,10 @@ static int swf_write_header(AVFormatContext *s)
                 return -1;
             }
         } else {
+            if (swf->video_enc) {
+                av_log(s, AV_LOG_ERROR, "SWF muxer only supports 1 video stream\n");
+                return AVERROR_INVALIDDATA;
+            }
             if (enc->codec_id == AV_CODEC_ID_VP6F ||
                 enc->codec_id == AV_CODEC_ID_FLV1 ||
                 enc->codec_id == AV_CODEC_ID_MJPEG) {



More information about the libav-commits mailing list