Browse files

exr: fix scan_line_size calculation

This one will also work in cases when file have channels
we are not going to use.

Only compressed files where affected by this bug.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
  • Loading branch information...
1 parent cd3136e commit bc0ef29cf087efdb0b073422a83072d4dfbd4300 @richardpl richardpl committed Jul 13, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 libavcodec/exr.c
View
2 libavcodec/exr.c
@@ -498,7 +498,7 @@ static int decode_frame(AVCodecContext *avctx,
bxmin = xmin * 2 * av_pix_fmt_descriptors[avctx->pix_fmt].nb_components;
axmax = (avctx->width - (xmax + 1)) * 2 * av_pix_fmt_descriptors[avctx->pix_fmt].nb_components;
out_line_size = avctx->width * 2 * av_pix_fmt_descriptors[avctx->pix_fmt].nb_components;
- scan_line_size = xdelta * av_pix_fmt_descriptors[avctx->pix_fmt].nb_components * FFMAX(2 * s->bits_per_color_id, 1);
+ scan_line_size = xdelta * current_channel_offset;
uncompressed_size = scan_line_size * scan_lines_per_block;
if (s->compr != EXR_RAW) {

0 comments on commit bc0ef29

Please sign in to comment.