From: Michael Niedermayer <[email protected]>
CC: [email protected]
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 1e2ab98460761c86268993e7a7ee690876df5efd)
Signed-off-by: Tim Walker <[email protected]>
---
libavcodec/vc1dec.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 8ad4f0f..00d8e4f 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);
}
}
--
1.9.3 (Apple Git-50)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
