From bc0ef29cf087efdb0b073422a83072d4dfbd4300 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 13 Jul 2012 23:48:50 +0000 Subject: [PATCH] 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 --- libavcodec/exr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 0d66eecb9c..62ffdeaaa7 100644 --- a/libavcodec/exr.c +++ b/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) {