aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-02-14 19:24:37 +0000
committerDiego Biurrun <diego@biurrun.de>2009-02-14 19:24:37 +0000
commiteba9cecc8b3ee088d99a0e0d82b15618d5efbfff (patch)
tree07eeb285e0ac4e7a70a2086ebbe8caaeb3f9a490
parent1f7c1d140a8dc0d6477179bc9d0633ebf3ffdb43 (diff)
downloadffmpeg-eba9cecc8b3ee088d99a0e0d82b15618d5efbfff.tar.gz
Restore one set of parentheses to avoid the warning:
libavcodec/mpegvideo_xvmc.c: In function ‘ff_xvmc_decode_mb’: libavcodec/mpegvideo_xvmc.c:269: warning: suggest parentheses around && within || Originally committed as revision 17267 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpegvideo_xvmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_xvmc.c b/libavcodec/mpegvideo_xvmc.c
index e1d0e7e056..0a9496442a 100644
--- a/libavcodec/mpegvideo_xvmc.c
+++ b/libavcodec/mpegvideo_xvmc.c
@@ -266,7 +266,7 @@ void ff_xvmc_decode_mb(MpegEncContext *s)
for (i = 0; i < blocks_per_mb; i++) {
if (s->block_last_index[i] >= 0) {
// I do not have unsigned_intra MOCO to test, hope it is OK.
- if (s->mb_intra && (render->idct || !render->idct && !render->unsigned_intra))
+ if (s->mb_intra && (render->idct || (!render->idct && !render->unsigned_intra)))
s->pblocks[i][0] -= 1 << 10;
if (!render->idct) {
s->dsp.idct(s->pblocks[i]);