[FFmpeg-cvslog] avformat/concatdec: Forward whitelists to the subdemuxers.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 23 16:13:05 2014 +0200| [5ea0753a15367dc0f212e8652fab1d36dd491877] | committer: Michael Niedermayer

avformat/concatdec: Forward whitelists to the subdemuxers.

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

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

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

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 9e98579..ed959cf 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);