Commit 6b78a77a authored by Kostya Shishkov's avatar Kostya Shishkov

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

Originally committed as revision 18202 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 888facff
...@@ -244,6 +244,8 @@ static int bmp_decode_frame(AVCodecContext *avctx, ...@@ -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, ...@@ -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;
......
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