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

[reimar]

Author: reimar
Date: Sun May 31 13:35:20 2009
New Revision: 19061

Log:
Merge variable declaration and initialization.

Modified:
   trunk/libavcodec/lcldec.c

Modified: trunk/libavcodec/lcldec.c
==============================================================================
--- trunk/libavcodec/lcldec.c	Sun May 31 13:34:19 2009	(r19060)
+++ trunk/libavcodec/lcldec.c	Sun May 31 13:35:20 2009	(r19061)
@@ -83,7 +83,6 @@ static unsigned int mszh_decomp(const un
     const unsigned char *srcptr_end = srcptr + srclen;
     unsigned mask = *srcptr++;
     unsigned maskbit = 0x80;
-    unsigned int ofs, cnt;
 
     while (srcptr < srcptr_end && destptr < destptr_end) {
         if (!(mask & maskbit)) {
@@ -91,8 +90,8 @@ static unsigned int mszh_decomp(const un
             destptr += 4;
             srcptr += 4;
         } else {
-            ofs = bytestream_get_le16(&srcptr);
-            cnt = (ofs >> 11) + 1;
+            unsigned ofs = bytestream_get_le16(&srcptr);
+            unsigned cnt = (ofs >> 11) + 1;
             ofs &= 0x7ff;
             cnt *= 4;
             cnt = FFMIN(cnt, destptr_end - destptr);