summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2014-03-07 14:02:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-07 16:03:03 +0100
commit930f67b71294c37b89c661c6c67982df76a2785a (patch)
tree53dbb20f18cd21dd3563b4407e752fa43a1b9529 /libavcodec
parent4fc339faea114873125b2bef1a8412059ab0e850 (diff)
dxva2_vc1: fix intensity compensation condition with interlaced fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dxva2_vc1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
index a86d7cdc22..88138e342e 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;
}
}