[FFmpeg-cvslog] lavf/concat: reject empty scripts.

Nicolas George git at videolan.org
Wed May 15 20:28:25 CEST 2013


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed May 15 16:53:35 2013 +0200| [ca2f6b6932144c3ec7828c4b828af80b9e36e38a] | committer: Nicolas George

lavf/concat: reject empty scripts.

Fix trac ticket #2566.

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

 libavformat/concatdec.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 78362e2..79fb394 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -216,6 +216,8 @@ static int concat_read_header(AVFormatContext *avf)
     }
     if (ret < 0)
         FAIL(ret);
+    if (!cat->nb_files)
+        FAIL(AVERROR_INVALIDDATA);
 
     for (i = 0; i < cat->nb_files; i++) {
         if (cat->files[i].start_time == AV_NOPTS_VALUE)



More information about the ffmpeg-cvslog mailing list