[SCM] libav/experimental: One more use for FFMIN.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:47:06 UTC 2013


The following commit has been merged in the experimental branch:
commit e4f141ad60afbd721e494975677fbfd8e0ebcb22
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun May 31 10:44:42 2009 +0000

    One more use for FFMIN.
    
    Originally committed as revision 19055 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 927f77b..5225ff0 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -102,9 +102,7 @@ static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsign
             cnt = (ofs >> 11) + 1;
             ofs &= 0x7ff;
             cnt *= 4;
-            if (destptr_end - destptr < cnt) {
-                cnt =  destptr_end - destptr;
-            }
+            cnt = FFMIN(cnt, destptr_end - destptr);
             av_memcpy_backptr(destptr, ofs, cnt);
             destptr += cnt;
         }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list