From ad83cfec5ad2079acf2defcae1b578446b1d21da Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 23 Oct 2014 16:07:00 +0200 Subject: avformat/mpeg: Forward whitelists to the mpegps demuxer Signed-off-by: Michael Niedermayer --- libavformat/mpeg.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libavformat/mpeg.c') diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index b153727ac6..09af46e404 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -695,6 +695,14 @@ static int vobsub_read_header(AVFormatContext *s) } memcpy(ext, !strncmp(ext, "IDX", 3) ? "SUB" : "sub", 3); av_log(s, AV_LOG_VERBOSE, "IDX/SUB: %s -> %s\n", s->filename, sub_name); + + vobsub->sub_ctx = avformat_alloc_context(); + if (!vobsub->sub_ctx) + return AVERROR(ENOMEM); + + vobsub->sub_ctx-> codec_whitelist = av_strdup(s->codec_whitelist); + vobsub->sub_ctx->format_whitelist = av_strdup(s->format_whitelist); + ret = avformat_open_input(&vobsub->sub_ctx, sub_name, &ff_mpegps_demuxer, NULL); if (ret < 0) { av_log(s, AV_LOG_ERROR, "Unable to open %s as MPEG subtitles\n", sub_name); -- cgit v1.2.3