ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Oct 23 16:08:51 2014 +0200| [feb9057b838e37a22a9c4c4a69207b17d787c78a] | committer: Michael Niedermayer
Forward whitelists to the asf demuxer Signed-off-by: Michael Niedermayer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=feb9057b838e37a22a9c4c4a69207b17d787c78a --- libavformat/rtpdec_asf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 8e19654..f21197a 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -25,6 +25,7 @@ * @author Ronald S. Bultje <[email protected]> */ +#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) _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
