summaryrefslogtreecommitdiff
path: root/libavcodec/ac3.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-09-27 04:57:36 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-09-27 04:57:36 +0000
commitf805d5fc9db77ad68aacf8c498dfaf41e0e9bedd (patch)
treeffd5783f594a5a9e695a7c45af8ef30b5c1a1112 /libavcodec/ac3.c
parent612bdf180809f3ac03c449ea6f405f2688efa723 (diff)
downloadffmpeg-f805d5fc9db77ad68aacf8c498dfaf41e0e9bedd.tar.gz
simplify 2 lines into 1 using FFMIN
Originally committed as revision 20043 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ac3.c')
-rw-r--r--libavcodec/ac3.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 4b4cba5cf9..bece2b38f8 100644
--- a/libavcodec/ac3.c
+++ b/libavcodec/ac3.c
@@ -156,8 +156,7 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
}
}
- end1=bndend;
- if (end1 > 22) end1=22;
+ end1 = FFMIN(bndend, 22);
for (bin = begin; bin < end1; bin++) {
if (!(is_lfe && bin == 6))