summaryrefslogtreecommitdiff
path: root/libavformat/concatdec.c
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2014-04-14 10:38:36 +0200
committerNicolas George <george@nsup.org>2014-04-29 13:25:59 +0200
commitc27939d871030ab79d5ef4e40ad6e4388db0c746 (patch)
tree33fdd774c7044a52468b6f0d7d75841de556ddf8 /libavformat/concatdec.c
parente973cf04f6bfad5a3ecbb7b9738e94d1464b0477 (diff)
lavf/concatdec: check match_streams() return value.
Diffstat (limited to 'libavformat/concatdec.c')
-rw-r--r--libavformat/concatdec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 32e47d76b5..ca193f92ec 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -369,7 +369,10 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
if (ret < 0)
return ret;
if (cat->match_streams) {
- match_streams(avf);
+ if ((ret = match_streams(avf)) < 0) {
+ av_packet_unref(pkt);
+ return ret;
+ }
cs = &cat->cur_file->streams[pkt->stream_index];
if (cs->out_stream_index < 0) {
av_packet_unref(pkt);