diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 16:08:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-23 18:19:37 +0200 |
| commit | feb9057b838e37a22a9c4c4a69207b17d787c78a (patch) | |
| tree | 86ecede1cf30fa7d8904b547397bd31ca8b0ced8 | |
| parent | b76234c00c7cac154dac50f4993e4372e47e3718 (diff) | |
| download | ffmpeg-feb9057b838e37a22a9c4c4a69207b17d787c78a.tar.gz | |
Forward whitelists to the asf demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpdec_asf.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 8e196545de..f21197aab2 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -25,6 +25,7 @@ * @author Ronald S. Bultje <rbultje@ronald.bitfreak.net> */ +#include "libavutil/avassert.h" #include "libavutil/base64.h" #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" @@ -115,6 +116,11 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p) return AVERROR(ENOMEM); rt->asf_ctx->pb = &pb; av_dict_set(&opts, "no_resync_search", "1", 0); + + av_assert0(!rt->asf_ctx->codec_whitelist && !rt->asf_ctx->format_whitelist); + rt->asf_ctx-> codec_whitelist = av_strdup(s->codec_whitelist); + rt->asf_ctx->format_whitelist = av_strdup(s->format_whitelist); + ret = avformat_open_input(&rt->asf_ctx, "", &ff_asf_demuxer, &opts); av_dict_free(&opts); if (ret < 0) |