From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sun, 27 Sep 2009 04:57:36 +0000 (+0000)
Subject: simplify 2 lines into 1 using FFMIN
X-Git-Tag: v0.6~3145
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f805d5fc9db77ad68aacf8c498dfaf41e0e9bedd;p=platform%2Fupstream%2Flibav.git

simplify 2 lines into 1 using FFMIN

Originally committed as revision 20043 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 4b4cba5..bece2b3 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))