virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

msrledec: merge switches

Browse Source 
More speedup and fixes 'may be used uninitialized in this function' warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-30 16:41:33 +01:00
parent dbaae33c2c
commit d2e0a276d5
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/msrledec.c
View File

@ -206,30 +206,24 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic,
if ((pic->linesize[0] > 0 && output + p1 * (depth >> 3) > output_end) || if ((pic->linesize[0] > 0 && output + p1 * (depth >> 3) > output_end) ||
(pic->linesize[0] < 0 && output + p1 * (depth >> 3) < output_end)) (pic->linesize[0] < 0 && output + p1 * (depth >> 3) < output_end))
continue; continue;
switch(depth){
case 8: pix[0] = bytestream2_get_byte(gb);
break;
case 16: pix16 = bytestream2_get_le16(gb);
break;
case 24: pix[0] = bytestream2_get_byte(gb);
pix[1] = bytestream2_get_byte(gb);
pix[2] = bytestream2_get_byte(gb);
break;
case 32: pix32 = bytestream2_get_le32(gb);
break;
}
switch(depth){ switch(depth){
case 8: case 8:
pix[0] = bytestream2_get_byte(gb);
for(i = 0; i < p1; i++) for(i = 0; i < p1; i++)
*output++ = pix[0]; *output++ = pix[0];
break; break;
case 16: case 16:
pix16 = bytestream2_get_le16(gb);
for(i = 0; i < p1; i++) { for(i = 0; i < p1; i++) {
*(uint16_t*)output = pix16; *(uint16_t*)output = pix16;
output += 2; output += 2;
} }
break; break;
case 24: case 24:
pix[0] = bytestream2_get_byte(gb);
pix[1] = bytestream2_get_byte(gb);
pix[2] = bytestream2_get_byte(gb);
for(i = 0; i < p1; i++) { for(i = 0; i < p1; i++) {
*output++ = pix[0]; *output++ = pix[0];
*output++ = pix[1]; *output++ = pix[1];
@ -237,6 +231,7 @@ static int msrle_decode_8_16_24_32(AVCodecContext *avctx, AVPicture *pic,
} }
break; break;
case 32: case 32:
pix32 = bytestream2_get_le32(gb);
for(i = 0; i < p1; i++) { for(i = 0; i < p1; i++) {
*(uint32_t*)output = pix32; *(uint32_t*)output = pix32;
output += 4; output += 4;