diff options
| author | Stefano Sabatini <stefasab@gmail.com> | 2013-12-18 14:56:36 +0100 |
|---|---|---|
| committer | Stefano Sabatini <stefasab@gmail.com> | 2013-12-18 15:14:58 +0100 |
| commit | aeccb522ebb6fb0378bccd6393f1d0c1ca40fdd4 (patch) | |
| tree | a1612b8c838209a6d3d2f78c0a846d974258fcff /libavformat | |
| parent | 8937af7b6fca19ab9be4d2371a04e25df2fa8d1e (diff) | |
| download | ffmpeg-aeccb522ebb6fb0378bccd6393f1d0c1ca40fdd4.tar.gz | |
lavf/concatdec: fix crash in case a file in script cannot be opened
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/concatdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 428c749ab2..86f82e01ed 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -279,6 +279,9 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) (ret = open_next_file(avf)) < 0) break; } + if (ret < 0) + return ret; + delta = av_rescale_q(cat->cur_file->start_time - cat->avf->start_time, AV_TIME_BASE_Q, cat->avf->streams[pkt->stream_index]->time_base); |