RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/concatdec: pass the interrupt callback on 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Zhang Rui 2014-02-08 12:17:42 +08:00 committed by Michael Niedermayer
parent 1c1bb203dd
commit 4958628ba6
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/concatdec.c
View File

@ -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;