diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-21 16:16:32 +0100 |
|---|---|---|
| committer | Tim Walker <tdskywalker@gmail.com> | 2014-09-26 16:55:36 +0200 |
| commit | a97328afef0ccebfc8c3d9f9fdb8e93cbf1058ab (patch) | |
| tree | 81bf279e53dea6731f99dfdfa4feedcc30f6210a /libavcodec/vc1dec.c | |
| parent | b5fe13448b13bfdd48a75b7e12387e11e3526d7c (diff) | |
vc1: Use logical instead of bitwise or for twomv
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 4 |
1 files 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); } } |