diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 16:13:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 18:19:37 +0200 |
| commit | 5ea0753a15367dc0f212e8652fab1d36dd491877 (patch) | |
| tree | 24ee0841a71eb3b412c86f751da53ba76530bea3 /libavformat | |
| parent | feb9057b838e37a22a9c4c4a69207b17d787c78a (diff) | |
| download | ffmpeg-5ea0753a15367dc0f212e8652fab1d36dd491877.tar.gz | |
avformat/concatdec: Forward whitelists to the subdemuxers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/concatdec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 9e9857958d..ed959cf219 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -288,6 +288,11 @@ static int open_file(AVFormatContext *avf, unsigned fileno) return AVERROR(ENOMEM); cat->avf->interrupt_callback = avf->interrupt_callback; + + av_assert0(!cat->avf->codec_whitelist && !cat->avf->format_whitelist); + cat->avf-> codec_whitelist = av_strdup(avf->codec_whitelist); + cat->avf->format_whitelist = av_strdup(avf->format_whitelist); + 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); |