summaryrefslogtreecommitdiff
path: root/libavcodec/aaccoder.c
diff options
context:
space:
mode:
authorYoung Han Lee <cpumaker@gmail.com>2011-03-11 11:39:24 +0900
committerRonald S. Bultje <rsbultje@gmail.com>2011-03-16 23:12:43 -0400
commitf578854efce12842ed4e4e25b36cf2f798054468 (patch)
treecbf7b1499ba07fcb48b9d4ec5a99d82f2addfb4b /libavcodec/aaccoder.c
parentb7f2fdde74608d848f943377c40d3df804c5f955 (diff)
downloadffmpeg-f578854efce12842ed4e4e25b36cf2f798054468.tar.gz
aaccoder: Change FFMAX for allzero flag to OR bit operation
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec/aaccoder.c')
-rw-r--r--libavcodec/aaccoder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index 8063fb6cd4..d2c928205f 100644
--- a/libavcodec/aaccoder.c
+++ b/libavcodec/aaccoder.c
@@ -723,7 +723,7 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
sce->zeroes[w*16+g] = !nz;
if (nz)
minthr = FFMIN(minthr, uplim);
- allz = FFMAX(allz, nz);
+ allz |= nz;
}
}
for (w = 0; w < sce->ics.num_windows; w += sce->ics.group_len[w]) {