From d293e3464db647e72fffad50a678eca89546b65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 6 Apr 2012 16:58:48 +0300 Subject: [PATCH] rtpdec_asf: Set the no_resync_search option for the chained asf demuxer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Searching for packet markers doesn't make sense for this use case, where packets are fed one at a time to the demuxer. This fixes playing back streams that have packets not starting with the 0x82, 0x00, 0x00 marker. Signed-off-by: Martin Storsjö --- libavformat/rtpdec_asf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 2dd367556d..c1690ef8f1 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -99,6 +99,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p) if (av_strstart(p, "pgmpu:data:application/vnd.ms.wms-hdr.asfv1;base64,", &p)) { AVIOContext pb; RTSPState *rt = s->priv_data; + AVDictionary *opts = NULL; int len = strlen(p) * 6 / 8; char *buf = av_mallocz(len); av_base64_decode(buf, p, len); @@ -113,7 +114,9 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p) if (!(rt->asf_ctx = avformat_alloc_context())) return AVERROR(ENOMEM); rt->asf_ctx->pb = &pb; - ret = avformat_open_input(&rt->asf_ctx, "", &ff_asf_demuxer, NULL); + av_dict_set(&opts, "no_resync_search", "1", 0); + ret = avformat_open_input(&rt->asf_ctx, "", &ff_asf_demuxer, &opts); + av_dict_free(&opts); if (ret < 0) return ret; av_dict_copy(&s->metadata, rt->asf_ctx->metadata, 0);