vc1: Use logical instead of bitwise or for twomv
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Sep 2014 15:16:32 +0000 (16:16 +0100)
committerTim Walker <tdskywalker@gmail.com>
Fri, 26 Sep 2014 14:55:36 +0000 (16:55 +0200)
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
libavcodec/vc1dec.c

index 35245ab..41beaeb 100644 (file)
@@ -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);
                 }
             }