virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge some cases for reading raw data with different bit depths in BMP

Browse Source 
Originally committed as revision 18202 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2009-03-27 16:31:47 +00:00
parent 888facff22
commit 6b78a77a35
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/bmp.c
View File

@ -244,6 +244,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
}else{ }else{
switch(depth){ switch(depth){
case 1: case 1:
case 8:
case 24:
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;
@ -261,20 +263,6 @@ static int bmp_decode_frame(AVCodecContext *avctx,
ptr += linesize; ptr += linesize;
} }
break; 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: case 16:
for(i = 0; i < avctx->height; i++){ for(i = 0; i < avctx->height; i++){
const uint16_t *src = (const uint16_t *) buf; const uint16_t *src = (const uint16_t *) buf;