[FFmpeg-cvslog] lavf/flacenc: disallow creation of invalid files with -c copy

Paul B Mahol git at videolan.org
Mon Oct 22 10:07:38 CEST 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Oct 20 22:16:13 2012 +0000| [cb0add3ce961dfe8076e300564a1f2378ae90b6c] | committer: Paul B Mahol

lavf/flacenc: disallow creation of invalid files with -c copy

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb0add3ce961dfe8076e300564a1f2378ae90b6c
---

 libavformat/flacenc.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c
index 8c270ee..b625278 100644
--- a/libavformat/flacenc.c
+++ b/libavformat/flacenc.c
@@ -69,6 +69,15 @@ static int flac_write_header(struct AVFormatContext *s)
     int ret;
     AVCodecContext *codec = s->streams[0]->codec;
 
+    if (s->nb_streams > 1) {
+        av_log(s, AV_LOG_ERROR, "only one stream is supported\n");
+        return AVERROR(EINVAL);
+    }
+    if (codec->codec_id != AV_CODEC_ID_FLAC) {
+        av_log(s, AV_LOG_ERROR, "unsupported codec\n");
+        return AVERROR(EINVAL);
+    }
+
     ret = ff_flac_write_header(s->pb, codec, 0);
     if (ret)
         return ret;



More information about the ffmpeg-cvslog mailing list