[FFmpeg-cvslog] rv40: change a logical test into a bitwise one.

Christophe Gisquet git at videolan.org
Sun Apr 29 22:52:26 CEST 2012


ffmpeg | branch: master | Christophe Gisquet <christophe.gisquet at gmail.com> | Tue Apr 17 18:44:50 2012 +0000| [0195ab5f5ff216a8797623e62e2703f3df2624c2] | committer: Ronald S. Bultje

rv40: change a logical test into a bitwise one.

Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

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

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

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index 4c546c2..a3d3fcd 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;
 }
 
 /**



More information about the ffmpeg-cvslog mailing list