diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-11-10 23:07:27 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-12-04 16:04:27 +0100 |
| commit | 1e92d58e444e482948c06bd968e99beb214f1735 (patch) | |
| tree | 02b4e774c3340364b6c2e8c52804f0aba48a98f7 /libavcodec/bmp.c | |
| parent | 8dd92eca74c13b042eeb75636939dc6d459582a1 (diff) | |
| download | ffmpeg-1e92d58e444e482948c06bd968e99beb214f1735.tar.gz | |
bmp: fix some 1bit samples.
<= 8bpp BMP images always have palette.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/bmp.c')
| -rw-r--r-- | libavcodec/bmp.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 21ebeec694..f438d10613 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -171,17 +171,15 @@ static int bmp_decode_frame(AVCodecContext *avctx, else avctx->pix_fmt = PIX_FMT_GRAY8; break; + case 1: case 4: if(hsize - ihsize - 14 > 0){ avctx->pix_fmt = PIX_FMT_PAL8; }else{ - av_log(avctx, AV_LOG_ERROR, "Unknown palette for 16-colour BMP\n"); + av_log(avctx, AV_LOG_ERROR, "Unknown palette for %d-colour BMP\n", 1<<depth); return -1; } break; - case 1: - avctx->pix_fmt = PIX_FMT_MONOBLACK; - break; default: av_log(avctx, AV_LOG_ERROR, "depth %d not supported\n", depth); return -1; @@ -265,6 +263,22 @@ static int bmp_decode_frame(AVCodecContext *avctx, }else{ switch(depth){ case 1: + for (i = 0; i < avctx->height; i++) { + int j; + for (j = 0; j < n; j++) { + ptr[j*8+0] = buf[j] >> 7; + ptr[j*8+1] = (buf[j] >> 6) & 1; + ptr[j*8+2] = (buf[j] >> 5) & 1; + ptr[j*8+3] = (buf[j] >> 4) & 1; + ptr[j*8+4] = (buf[j] >> 3) & 1; + ptr[j*8+5] = (buf[j] >> 2) & 1; + ptr[j*8+6] = (buf[j] >> 1) & 1; + ptr[j*8+7] = buf[j] & 1; + } + buf += n; + ptr += linesize; + } + break; case 8: case 24: for(i = 0; i < avctx->height; i++){ |