[FFmpeg-cvslog] exr: fix scan_line_size calculation

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Jul 13 23:48:50 2012 +0000| [bc0ef29cf087efdb0b073422a83072d4dfbd4300] | committer: Paul B Mahol

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc0ef29cf087efdb0b073422a83072d4dfbd4300
---

 libavcodec/exr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 0d66eec..62ffdea 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) {