[FFmpeg-cvslog] dxva2_vc1: fix intensity compensation condition with interlaced fields

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Mar  7 14:02:58 2014 +0100| [930f67b71294c37b89c661c6c67982df76a2785a] | committer: Michael Niedermayer

dxva2_vc1: fix intensity compensation condition with interlaced fields

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=930f67b71294c37b89c661c6c67982df76a2785a
---

 libavcodec/dxva2_vc1.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
index a86d7cd..88138e3 100644
--- a/libavcodec/dxva2_vc1.c
+++ b/libavcodec/dxva2_vc1.c
@@ -43,7 +43,7 @@ static void fill_picture_parameters(AVCodecContext *avctx,
     // determine if intensity compensation is needed
     if (s->pict_type == AV_PICTURE_TYPE_P) {
       if ((v->fcm == ILACE_FRAME && v->intcomp) || (v->fcm != ILACE_FRAME && v->mv_mode == MV_PMODE_INTENSITY_COMP)) {
-        if (v->lumscale != 32 || v->lumshift != 0 || (s->picture_structure != PICT_FRAME && (v->lumscale2 != 32 && v->lumshift2 != 0)))
+        if (v->lumscale != 32 || v->lumshift != 0 || (s->picture_structure != PICT_FRAME && (v->lumscale2 != 32 || v->lumshift2 != 0)))
           intcomp = 1;
       }
     }