From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 19 Oct 2013 22:41:00 +0000 (+0200)
Subject: avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()
X-Git-Tag: android-x86-4.4-r1~505
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=23d69b158af433fab118b6b261d3bafa059761f8;p=android-x86%2Fexternal-ffmpeg.git

avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()

Fixes CID1108577

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index 9392a5a55e..2cf6860d1c 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -184,8 +184,8 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
                 return ret;
 
             for (j = 0; j < 3; j++) {
-                int hshift = (i > 0) ? desc->log2_chroma_w : 0;
-                int vshift = (i > 0) ? desc->log2_chroma_h : 0;
+                int hshift = (j > 0) ? desc->log2_chroma_w : 0;
+                int vshift = (j > 0) ? desc->log2_chroma_h : 0;
                 int off = ((frame->window.left_offset >> hshift) << pixel_shift) +
                           (frame->window.top_offset   >> vshift) * dst->linesize[j];
                 dst->data[j] += off;