From 4958628ba69ea7571af520f998fc700824cb5f81 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Sat, 8 Feb 2014 12:17:42 +0800 Subject: avformat/concatdec: pass the interrupt callback on Signed-off-by: Michael Niedermayer --- libavformat/concatdec.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libavformat/concatdec.c') 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; -- cgit v1.2.3