[FFmpeg-cvslog] r19041 - trunk/libavcodec/lcldec.c

[reimar]

Author: reimar
Date: Sun May 31 11:57:42 2009
New Revision: 19041

Log:
Use FFMIN

Modified:
   trunk/libavcodec/lcldec.c

Modified: trunk/libavcodec/lcldec.c
==============================================================================
--- trunk/libavcodec/lcldec.c	Sun May 31 11:51:46 2009	(r19040)
+++ trunk/libavcodec/lcldec.c	Sun May 31 11:57:42 2009	(r19041)
@@ -191,8 +191,7 @@ static int decode_frame(AVCodecContext *
             if (c->flags & FLAG_MULTITHREAD) {
                 mthread_inlen = *(unsigned int*)encoded;
                 mthread_outlen = *(unsigned int*)(encoded+4);
-                if (mthread_outlen > c->decomp_size) // this should not happen
-                    mthread_outlen = c->decomp_size;
+                mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
                 mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size);
                 if (mthread_outlen != mszh_dlen) {
                     av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n",
@@ -238,8 +237,7 @@ static int decode_frame(AVCodecContext *
             int ret;
             mthread_inlen = *(unsigned int*)encoded;
             mthread_outlen = *(unsigned int*)(encoded+4);
-            if (mthread_outlen > c->decomp_size)
-                mthread_outlen = c->decomp_size;
+            mthread_outlen = FFMIN(mthread_outlen, c->decomp_size);
             ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen);
             if (ret < 0) return ret;
             ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - mthread_inlen,