[FFmpeg-cvslog] avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()

Michael Niedermayer git at videolan.org
Sun Oct 20 01:15:12 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 20 00:41:00 2013 +0200| [23d69b158af433fab118b6b261d3bafa059761f8] | committer: Michael Niedermayer

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

Fixes CID1108577

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

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

 libavcodec/hevc_refs.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index 9392a5a..2cf6860 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;



More information about the ffmpeg-cvslog mailing list