[FFmpeg-cvslog] lavf/concatdec: check match_streams() return value.

Nicolas George git at videolan.org
Tue Apr 29 19:43:51 CEST 2014


ffmpeg | branch: master | Nicolas George <george at nsup.org> | Mon Apr 14 10:38:36 2014 +0200| [c27939d871030ab79d5ef4e40ad6e4388db0c746] | committer: Nicolas George

lavf/concatdec: check match_streams() return value.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c27939d871030ab79d5ef4e40ad6e4388db0c746
---

 libavformat/concatdec.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 32e47d7..ca193f9 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);



More information about the ffmpeg-cvslog mailing list