From a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 21 Sep 2014 16:16:32 +0100 Subject: [PATCH] vc1: Use logical instead of bitwise or for twomv CC: libav-stable@libav.org Signed-off-by: Michael Niedermayer Signed-off-by: Tim Walker --- libavcodec/vc1dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 35245abef1..41beaebce5 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -4570,9 +4570,9 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) if (mb_has_coeffs) cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2); if (!direct) { - if (bmvtype == (BMV_TYPE_INTERPOLATED & twomv)) { + if (bmvtype == BMV_TYPE_INTERPOLATED && twomv) { v->fourmvbp = get_vlc2(gb, v->fourmvbp_vlc->table, VC1_4MV_BLOCK_PATTERN_VLC_BITS, 1); - } else if (bmvtype == (BMV_TYPE_INTERPOLATED | twomv)) { + } else if (bmvtype == BMV_TYPE_INTERPOLATED || twomv) { v->twomvbp = get_vlc2(gb, v->twomvbp_vlc->table, VC1_2MV_BLOCK_PATTERN_VLC_BITS, 1); } }