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 (file)
--- 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))