[FFmpeg-cvslog] avformat/concatdec: pass the interrupt callback on

[Zhang Rui]

ffmpeg | branch: master | Zhang Rui <bbcallen at gmail.com> | Sat Feb  8 12:17:42 2014 +0800| [4958628ba69ea7571af520f998fc700824cb5f81] | committer: Michael Niedermayer

avformat/concatdec: pass the interrupt callback on

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/concatdec.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 86f82e0..979499a 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -132,9 +132,16 @@ static int open_file(AVFormatContext *avf, unsigned fileno)
 
     if (cat->avf)
         avformat_close_input(&cat->avf);
+
+    cat->avf = avformat_alloc_context();
+    if (!cat->avf)
+        return AVERROR(ENOMEM);
+
+    cat->avf->interrupt_callback = avf->interrupt_callback;
     if ((ret = avformat_open_input(&cat->avf, file->url, NULL, NULL)) < 0 ||
         (ret = avformat_find_stream_info(cat->avf, NULL)) < 0) {
         av_log(avf, AV_LOG_ERROR, "Impossible to open '%s'\n", file->url);
+        avformat_close_input(&cat->avf);
         return ret;
     }
     cat->cur_file = file;