RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-09 16:50:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge variable declaration and initialization.

Browse Source 
Originally committed as revision 19061 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Reimar Döffinger 2009-05-31 11:35:20 +00:00
parent 7c20421661
commit 7ffc844742
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/lcldec.c
View File

@ -83,7 +83,6 @@ static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsign
const unsigned char *srcptr_end = srcptr + srclen; const unsigned char *srcptr_end = srcptr + srclen;
unsigned mask = *srcptr++; unsigned mask = *srcptr++;
unsigned maskbit = 0x80; unsigned maskbit = 0x80;
unsigned int ofs, cnt;
while (srcptr < srcptr_end && destptr < destptr_end) { while (srcptr < srcptr_end && destptr < destptr_end) {
if (!(mask & maskbit)) { if (!(mask & maskbit)) {
@ -91,8 +90,8 @@ static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsign
destptr += 4; destptr += 4;
srcptr += 4; srcptr += 4;
} else { } else {
ofs = bytestream_get_le16(&srcptr); unsigned ofs = bytestream_get_le16(&srcptr);
cnt = (ofs >> 11) + 1; unsigned cnt = (ofs >> 11) + 1;
ofs &= 0x7ff; ofs &= 0x7ff;
cnt *= 4; cnt *= 4;
cnt = FFMIN(cnt, destptr_end - destptr); cnt = FFMIN(cnt, destptr_end - destptr);