diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:48:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:55:00 +0200 |
| commit | e80cbdbc57292a4687339f6a7d30e0dcff42f9e8 (patch) | |
| tree | c71ab556c3aa7a3307a39e24f7250d9645958aa8 /libavcodec/bmp.c | |
| parent | 744e4429cf9a2ac5c7c1e4ed8bfbb6f9f09a882a (diff) | |
| parent | 2568646abb6568b1d329f800a046832adc48acd4 (diff) | |
| download | ffmpeg-e80cbdbc57292a4687339f6a7d30e0dcff42f9e8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: drop unnecessary arguments to hpel_motion()
mpegvideo: drop 'inline' from some functions
nellymoserdec: drop support for s16 output.
bmpdec: only initialize palette for pal8.
build: Properly remove object files while cleaning
flacdsp: arm optimised lpc filter
compat/vsnprintf: return number of bytes required on truncation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bmp.c')
| -rw-r--r-- | libavcodec/bmp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index e97038c5fe..7e160ae556 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -232,9 +232,6 @@ static int bmp_decode_frame(AVCodecContext *avctx, if(comp == BMP_RLE4 || comp == BMP_RLE8) memset(p->data[0], 0, avctx->height * p->linesize[0]); - if(depth == 4 || depth == 8) - memset(p->data[1], 0, 1024); - if(height > 0){ ptr = p->data[0] + (avctx->height - 1) * p->linesize[0]; linesize = -p->linesize[0]; @@ -245,6 +242,9 @@ static int bmp_decode_frame(AVCodecContext *avctx, if(avctx->pix_fmt == PIX_FMT_PAL8){ int colors = 1 << depth; + + memset(p->data[1], 0, 1024); + if(ihsize >= 36){ int t; buf = buf0 + 46; |