aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Gisquet <christophe.gisquet@gmail.com>2012-04-17 18:44:50 +0000
committerRonald S. Bultje <rsbultje@gmail.com>2012-04-28 11:09:32 -0700
commit0195ab5f5ff216a8797623e62e2703f3df2624c2 (patch)
tree6dde4d1f554122020199837e92bc33b706b09950
parent88027999919332b2e6b27f357b3eb12d7e0abdad (diff)
downloadffmpeg-0195ab5f5ff216a8797623e62e2703f3df2624c2.tar.gz
rv40: change a logical test into a bitwise one.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
-rw-r--r--libavcodec/rv34.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 4c546c22f0..a3d3fcd3ea 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -313,7 +313,7 @@ static inline int rv34_decode_block(DCTELEM *dst, GetBitContext *gb, RV34VLC *rv
code = get_vlc2(gb, rvlc->third_pattern[sc].table, 9, 2);
decode_subblock(dst + 4*2+2, code, 0, gb, &rvlc->coefficient, q_ac2);
}
- return has_ac || pattern;
+ return has_ac | pattern;
}
/**