diff options
| author | Marton Balint <cus@passwd.hu> | 2015-11-28 13:05:30 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2016-01-10 14:13:16 +0100 |
| commit | fdb2d4b1084c92aa9bb1d2f948abdb86a361f219 (patch) | |
| tree | 43d5ae67dd614e1a1747315aa92825195848b8b8 | |
| parent | a43deea8614a901aae85d175b6580183aede20f9 (diff) | |
| download | ffmpeg-fdb2d4b1084c92aa9bb1d2f948abdb86a361f219.tar.gz | |
lavf/concatdec: do not access packet if av_read_frame returned error
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
| -rw-r--r-- | libavformat/concatdec.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index d21805fe71..d226e1504e 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -555,9 +555,7 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) while (1) { ret = av_read_frame(cat->avf, pkt); - if (ret == AVERROR_EOF || packet_after_outpoint(cat, pkt)) { - if (ret == 0) - av_packet_unref(pkt); + if (ret == AVERROR_EOF) { if ((ret = open_next_file(avf)) < 0) return ret; continue; @@ -568,6 +566,12 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) av_packet_unref(pkt); return ret; } + if (packet_after_outpoint(cat, pkt)) { + av_packet_unref(pkt); + if ((ret = open_next_file(avf)) < 0) + return ret; + continue; + } cs = &cat->cur_file->streams[pkt->stream_index]; if (cs->out_stream_index < 0) { av_packet_unref(pkt); |