[libav-commits] rv30: fix masking in rv30_loop_filter()

Xi Wang git at libav.org
Thu Jan 17 21:59:55 CET 2013


Module: libav
Branch: release/9
Commit: c3c1db7c5637c4e4d8dfdd748466a223f83fffa8

Author:    Xi Wang <xi.wang at gmail.com>
Committer: Luca Barbato <lu_zero at gentoo.org>
Date:      Thu Jan 17 01:24:15 2013 -0500

rv30: fix masking in rv30_loop_filter()

The mask `x && (1 << y)' is incorrect and always yields true.

The correct form should be `x & (1 << y)'.

CC: libav-stable at libav.org

Signed-off-by: Xi Wang <xi.wang at gmail.com>
(cherry picked from commit 783e37f7ef3b3cdcfe7aa927a25b4184ae46cd53)

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

---

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

diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index e4f3251..3c3579b 100644
--- a/libavcodec/rv30.c
+++ b/libavcodec/rv30.c
@@ -182,7 +182,7 @@ static void rv30_loop_filter(RV34DecContext *r, int row)
                 for(i = !mb_x; i < 2; i++, C += 4){
                     int ij = i + (j >> 1);
                     loc_lim = 0;
-                    if(cur_cbp && (1 << ij))
+                    if (cur_cbp & (1 << ij))
                         loc_lim = cur_lim;
                     else if(!i && left_cbp & (1 << (ij + 1)))
                         loc_lim = left_lim;
@@ -224,7 +224,7 @@ static void rv30_loop_filter(RV34DecContext *r, int row)
                 for(i = 0; i < 2; i++, C += 4){
                     int ij = i + (j >> 1);
                     loc_lim = 0;
-                    if(r->cbp_chroma[mb_pos] && (1 << ij))
+                    if (r->cbp_chroma[mb_pos] & (1 << ij))
                         loc_lim = cur_lim;
                     else if(!j && top_cbp & (1 << (ij + 2)))
                         loc_lim = top_lim;



More information about the libav-commits mailing list