RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 16:22:37 +00:00
Code Issues Projects Releases Wiki Activity

Cosmetics: reindent after last commit

Browse Source 
Originally committed as revision 15391 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2008-09-23 08:45:46 +00:00
parent fca506dfb6
commit b94a631fab
1 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
libavcodec/bmp.c
View File

@ -232,72 +232,72 @@ static int bmp_decode_frame(AVCodecContext *avctx,
if(comp == BMP_RLE4 || comp == BMP_RLE8){ if(comp == BMP_RLE4 || comp == BMP_RLE8){
ff_msrle_decode(avctx, p, depth, buf, dsize); ff_msrle_decode(avctx, p, depth, buf, dsize);
}else{ }else{
switch(depth){ switch(depth){
case 1: case 1:
for(i = 0; i < avctx->height; i++){ for(i = 0; i < avctx->height; i++){
memcpy(ptr, buf, n); memcpy(ptr, buf, n);
buf += n; buf += n;
ptr += linesize; ptr += linesize;
}
break;
case 4:
for(i = 0; i < avctx->height; i++){
int j;
for(j = 0; j < n; j++){
ptr[j*2+0] = (buf[j] >> 4) & 0xF;
ptr[j*2+1] = buf[j] & 0xF;
} }
buf += n; break;
ptr += linesize; case 4:
} for(i = 0; i < avctx->height; i++){
break; int j;
case 8: for(j = 0; j < n; j++){
for(i = 0; i < avctx->height; i++){ ptr[j*2+0] = (buf[j] >> 4) & 0xF;
memcpy(ptr, buf, avctx->width); ptr[j*2+1] = buf[j] & 0xF;
buf += n; }
ptr += linesize; buf += n;
} ptr += linesize;
break;
case 24:
for(i = 0; i < avctx->height; i++){
memcpy(ptr, buf, avctx->width*(depth>>3));
buf += n;
ptr += linesize;
}
break;
case 16:
for(i = 0; i < avctx->height; i++){
const uint16_t *src = (const uint16_t *) buf;
uint16_t *dst = (uint16_t *) ptr;
for(j = 0; j < avctx->width; j++)
*dst++ = le2me_16(*src++);
buf += n;
ptr += linesize;
}
break;
case 32:
for(i = 0; i < avctx->height; i++){
const uint8_t *src = buf;
uint8_t *dst = ptr;
for(j = 0; j < avctx->width; j++){
dst[0] = src[rgb[2]];
dst[1] = src[rgb[1]];
dst[2] = src[rgb[0]];
dst += 3;
src += 4;
} }
break;
case 8:
for(i = 0; i < avctx->height; i++){
memcpy(ptr, buf, avctx->width);
buf += n;
ptr += linesize;
}
break;
case 24:
for(i = 0; i < avctx->height; i++){
memcpy(ptr, buf, avctx->width*(depth>>3));
buf += n;
ptr += linesize;
}
break;
case 16:
for(i = 0; i < avctx->height; i++){
const uint16_t *src = (const uint16_t *) buf;
uint16_t *dst = (uint16_t *) ptr;
buf += n; for(j = 0; j < avctx->width; j++)
ptr += linesize; *dst++ = le2me_16(*src++);
buf += n;
ptr += linesize;
}
break;
case 32:
for(i = 0; i < avctx->height; i++){
const uint8_t *src = buf;
uint8_t *dst = ptr;
for(j = 0; j < avctx->width; j++){
dst[0] = src[rgb[2]];
dst[1] = src[rgb[1]];
dst[2] = src[rgb[0]];
dst += 3;
src += 4;
}
buf += n;
ptr += linesize;
}
break;
default:
av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
return -1;
} }
break;
default:
av_log(avctx, AV_LOG_ERROR, "BMP decoder is broken\n");
return -1;
}
} }
*picture = s->picture; *picture = s->picture;