mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-08 16:56:57 +02:00
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>
This commit is contained in:
parent
b5fe13448b
commit
a97328afef
@ -4570,9 +4570,9 @@ static int vc1_decode_b_mb_intfr(VC1Context *v)
|
|||||||
if (mb_has_coeffs)
|
if (mb_has_coeffs)
|
||||||
cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
|
cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_CBPCY_P_VLC_BITS, 2);
|
||||||
if (!direct) {
|
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);
|
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);
|
v->twomvbp = get_vlc2(gb, v->twomvbp_vlc->table, VC1_2MV_BLOCK_PATTERN_VLC_BITS, 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user