[FFmpeg-cvslog] flvenc: do not mux more than one stream per type
Rafaël Carré
git at videolan.org
Tue Apr 16 23:31:15 CEST 2013
ffmpeg | branch: master | Rafaël Carré <funman at videolan.org> | Mon Apr 15 13:14:28 2013 +0200| [5b27c307e7532d6a76dceb555c3c039e81517bd1] | committer: Luca Barbato
flvenc: do not mux more than one stream per type
FLV does not support multiple audio or video streams.
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b27c307e7532d6a76dceb555c3c039e81517bd1
---
libavformat/flvenc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index ff6d14a..37f3777 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -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;
More information about the ffmpeg-cvslog
mailing list