From ff486c0f7f6b2ace3f0238660bc06cc35b389676 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 19 Feb 2014 22:21:43 +0100 Subject: [PATCH] hevc: Do not right shift a negative value in get_pcm --- libavcodec/hevc_filter.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index 3437fd061e..eb3f5f3eda 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -317,11 +317,15 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y) static int get_pcm(HEVCContext *s, int x, int y) { int log2_min_pu_size = s->sps->log2_min_pu_size; - int x_pu = x >> log2_min_pu_size; - int y_pu = y >> log2_min_pu_size; + int x_pu, y_pu; - if (x < 0 || x_pu >= s->sps->min_pu_width || - y < 0 || y_pu >= s->sps->min_pu_height) + if (x < 0 || y < 0) + return 2; + + x_pu = x >> log2_min_pu_size; + y_pu = y >> log2_min_pu_size; + + if (x_pu >= s->sps->min_pu_width || y_pu >= s->sps->min_pu_height) return 2; return s->is_pcm[y_pu * s->sps->min_pu_width + x_pu]; }