RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'cigaes/master' 

* cigaes/master:
  lavf/concat: reject empty scripts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-15 20:22:05 +02:00
parent e3c24f663e ca2f6b6932
commit 42af97dbc0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/concatdec.c
View File

@ -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)