[FFmpeg-cvslog] avformat/hls: forward whitelists to mpegts demuxer
Michael Niedermayer
git at videolan.org
Thu Oct 23 15:43:56 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 23 15:26:46 2014 +0200| [24cd4e5071a710e3bdfd24efaf706e17cfec5b2c] | committer: Michael Niedermayer
avformat/hls: forward whitelists to mpegts demuxer
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24cd4e5071a710e3bdfd24efaf706e17cfec5b2c
---
libavformat/hls.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index e7bbdfd..1dd19d6 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;
More information about the ffmpeg-cvslog
mailing list