From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Wed, 21 Mar 2012 21:52:33 +0000 (+0100)
Subject: VC1: Fix skiploopfilter=all.
X-Git-Tag: android-x86-4.4-r1~12851
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0f95270afe694470464772db46d7df0fe2922629;p=android-x86%2Fexternal-ffmpeg.git

VC1: Fix skiploopfilter=all.

It is currently only handled in the parser code for WMV/ASF style
header, but not the one used in the bytestream format used when
muxed into MPEG-TS as on e.g. BluRay.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
---

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index c5979f4645..937fc1ace1 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -535,6 +535,8 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex
     v->panscanflag    = get_bits1(gb);
     v->refdist_flag   = get_bits1(gb);
     v->s.loop_filter  = get_bits1(gb);
+    if (v->s.avctx->skip_loop_filter >= AVDISCARD_ALL)
+        v->s.loop_filter = 0;
     v->fastuvmc       = get_bits1(gb);
     v->extended_mv    = get_bits1(gb);
     v->dquant         = get_bits(gb, 2);