Browse Source

libavcodec/psd : add test for channel depth/channel count in bitmap mode

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.3
Martin Vignali Michael Niedermayer 8 years ago
parent
commit
31e722e9da
1 changed files with 6 additions and 0 deletions
  1. +6
    -0
      libavcodec/psd.c

+ 6
- 0
libavcodec/psd.c View File

@@ -319,6 +319,12 @@ static int decode_frame(AVCodecContext *avctx, void *data,

switch (s->color_mode) {
case PSD_BITMAP:
if (s->channel_depth != 1 || s->channel_count != 1) {
av_log(s->avctx, AV_LOG_ERROR,
"Invalid bitmap file (channel_depth %d, channel_count %d)\n",
s->channel_depth, s->channel_count);
return AVERROR_INVALIDDATA;
}
s->line_size = s->width + 7 >> 3;
avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
break;


Loading…
Cancel
Save