[SCM] libav/master: vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d456baafb68cd80c0f537f1d843076e4dd853558
Author: Diego Biurrun <diego at biurrun.de>
Date:   Fri Aug 15 22:13:08 2014 +0200

    vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index f0ea471..8ad4f0f 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);
                 }
             }

-- 
Libav/FFmpeg packaging