summaryrefslogtreecommitdiff
path: root/libavformat/concatdec.c
diff options
context:
space:
mode:
authorZhang Rui <bbcallen@gmail.com>2014-02-08 12:17:42 +0800
committerMichael Niedermayer <michaelni@gmx.at>2014-02-10 15:42:48 +0100
commit4958628ba69ea7571af520f998fc700824cb5f81 (patch)
treed86787ef8751a9fb5f7fe42bd152571bdfe85563 /libavformat/concatdec.c
parent1c1bb203ddae855547e58fb1d08aee59888aa967 (diff)
downloadffmpeg-4958628ba69ea7571af520f998fc700824cb5f81.tar.gz
avformat/concatdec: pass the interrupt callback on
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/concatdec.c')
-rw-r--r--libavformat/concatdec.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 86f82e01ed..979499af0c 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;