summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2013-05-15 16:53:35 +0200
committerNicolas George <nicolas.george@normalesup.org>2013-05-15 16:53:35 +0200
commitca2f6b6932144c3ec7828c4b828af80b9e36e38a (patch)
tree611d3c04235140959cdb59d9a8f18a830d84364e /libavformat
parentc45b823bf80fdb5dd6dedb67cd56935b83c17ba5 (diff)
downloadffmpeg-streaming-ca2f6b6932144c3ec7828c4b828af80b9e36e38a.zip
ffmpeg-streaming-ca2f6b6932144c3ec7828c4b828af80b9e36e38a.tar.gz
lavf/concat: reject empty scripts.
Fix trac ticket #2566.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/concatdec.c2
1 files changed, 2 insertions, 0 deletions
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)
OpenPOWER on IntegriCloud