aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-23 15:26:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-23 15:26:46 +0200
commit24cd4e5071a710e3bdfd24efaf706e17cfec5b2c (patch)
tree2e9fa12184c671f1468d237349d4c9210d6e6d24 /libavformat
parent2de9c5ed98e4929541cbc6bcede4877dbbf81bf4 (diff)
downloadffmpeg-24cd4e5071a710e3bdfd24efaf706e17cfec5b2c.tar.gz
avformat/hls: forward whitelists to mpegts demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/hls.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/hls.c b/libavformat/hls.c
index e7bbdfda0a..1dd19d659f 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1344,6 +1344,11 @@ static int hls_read_header(AVFormatContext *s)
}
pls->ctx->pb = &pls->pb;
pls->stream_offset = stream_offset;
+
+ av_assert0(!pls->ctx->codec_whitelist && !pls->ctx->format_whitelist);
+ pls->ctx-> codec_whitelist = av_strdup(s->codec_whitelist);
+ pls->ctx->format_whitelist = av_strdup(s->format_whitelist);
+
ret = avformat_open_input(&pls->ctx, pls->segments[0]->url, in_fmt, NULL);
if (ret < 0)
goto fail;