From 7ffc84474239d96b2aae6117bbe49ce9481099fc Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Sun, 31 May 2009 11:35:20 +0000 Subject: Merge variable declaration and initialization. Originally committed as revision 19061 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/lcldec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 7663655080..f53d91e715 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -83,7 +83,6 @@ static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsign 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 unsigned char * srcptr, int srclen, unsign 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); -- cgit v1.2.3