]> git.sesse.net Git - ffmpeg/commitdiff
flvenc: do not mux more than one stream per type
authorRafaël Carré <funman@videolan.org>
Mon, 15 Apr 2013 11:14:28 +0000 (13:14 +0200)
committerLuca Barbato <lu_zero@gentoo.org>
Tue, 16 Apr 2013 08:31:38 +0000 (10:31 +0200)
FLV does not support multiple audio or video streams.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
libavformat/flvenc.c

index ff6d14a24841426cf8a9b5fb02e1f54a9f121df8..37f37773a06c8140a20c9d9e228ce9d81cb546cc 100644 (file)
@@ -208,6 +208,11 @@ static int flv_write_header(AVFormatContext *s)
             } else {
                 framerate = 1 / av_q2d(s->streams[i]->codec->time_base);
             }
+            if (video_enc) {
+                av_log(s, AV_LOG_ERROR,
+                       "at most one video stream is supported in flv\n");
+                return AVERROR(EINVAL);
+            }
             video_enc = enc;
             if (enc->codec_tag == 0) {
                 av_log(s, AV_LOG_ERROR, "video codec not compatible with flv\n");
@@ -215,6 +220,11 @@ static int flv_write_header(AVFormatContext *s)
             }
             break;
         case AVMEDIA_TYPE_AUDIO:
+            if (audio_enc) {
+                av_log(s, AV_LOG_ERROR,
+                       "at most one audio stream is supported in flv\n");
+                return AVERROR(EINVAL);
+            }
             audio_enc = enc;
             if (get_audio_flags(s, enc) < 0)
                 return AVERROR_INVALIDDATA;