diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 20:22:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-15 20:22:31 +0200 |
| commit | 42af97dbc0fa3beff04c2685d0c13ce335b14589 (patch) | |
| tree | 1b662f8ee60c4d444f498fd07cebd6000414f3f4 | |
| parent | e3c24f663ea795c5455301d5f00e46ca455e7afb (diff) | |
| parent | ca2f6b6932144c3ec7828c4b828af80b9e36e38a (diff) | |
| download | ffmpeg-42af97dbc0fa3beff04c2685d0c13ce335b14589.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/concat: reject empty scripts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/concatdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 78362e2c65..79fb394d45 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) |