diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-20 00:00:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 14:32:04 +0200 |
| commit | 1e2ab98460761c86268993e7a7ee690876df5efd (patch) | |
| tree | 87f7d2ad344193ea6b5c44f32386ea006483d3ab /libavcodec/vc1dec.c | |
| parent | 867e7bb4f101e74d69a637ab38e90360dfe8bceb (diff) | |
| download | ffmpeg-1e2ab98460761c86268993e7a7ee690876df5efd.tar.gz | |
avcodec/vc1dec: use logical operation instead of bitwise for twomv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 6749c2bee5..bfbbc6aed7 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -4550,9 +4550,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); } } |