diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 16:07:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 18:19:37 +0200 |
| commit | ad83cfec5ad2079acf2defcae1b578446b1d21da (patch) | |
| tree | 5668c9865d65d01bd453d599eb58b3c838bc61c6 | |
| parent | ad5f861b8ce34dd5a3c643bc50a1b8c82138bbcd (diff) | |
| download | ffmpeg-ad83cfec5ad2079acf2defcae1b578446b1d21da.tar.gz | |
avformat/mpeg: Forward whitelists to the mpegps demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpeg.c | 8 |
1 files changed, 8 insertions, 0 deletions
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); |