Commit 7ffc8447 authored by Reimar Döffinger's avatar Reimar Döffinger

Merge variable declaration and initialization.

Originally committed as revision 19061 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7c204216
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment