[FFmpeg-cvslog] vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

Diego Biurrun git at videolan.org
Tue Aug 19 19:11:43 CEST 2014


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Aug 15 22:13:08 2014 +0200| [d456baafb68cd80c0f537f1d843076e4dd853558] | committer: Diego Biurrun

vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d456baafb68cd80c0f537f1d843076e4dd853558
---

 libavcodec/vc1dec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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);
                 }
             }



More information about the ffmpeg-cvslog mailing list