Skip to content

F
ffmpeg
Commit 2201d1a0 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avcodec/hevc: Fix undefined shifts 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 0be95996
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
libavcodec/hevc.c
View file @ 2201d1a0
...@@ -1172,8 +1172,8 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, ...@@ -1172,8 +1172,8 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride,
int y_off1 = y_off + (mv1->y >> 2); int y_off1 = y_off + (mv1->y >> 2);
int idx = ff_hevc_pel_weight[block_w]; int idx = ff_hevc_pel_weight[block_w];
uint8_t *src0 = ref0->data[0] + y_off0 * src0stride + (x_off0 << s->sps->pixel_shift); uint8_t *src0 = ref0->data[0] + y_off0 * src0stride + (int)((unsigned)x_off0 << s->sps->pixel_shift);
uint8_t *src1 = ref1->data[0] + y_off1 * src1stride + (x_off1 << s->sps->pixel_shift); uint8_t *src1 = ref1->data[0] + y_off1 * src1stride + (int)((unsigned)x_off1 << s->sps->pixel_shift);
if (x_off0 < QPEL_EXTRA_BEFORE || y_off0 < QPEL_EXTRA_AFTER || if (x_off0 < QPEL_EXTRA_BEFORE || y_off0 < QPEL_EXTRA_AFTER ||
x_off0 >= pic_width - block_w - QPEL_EXTRA_AFTER || x_off0 >= pic_width - block_w - QPEL_EXTRA_AFTER ||
...@@ -1340,8 +1340,8 @@ static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVF ...@@ -1340,8 +1340,8 @@ static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0, ptrdiff_t dststride, AVF
int x_off1 = x_off + (mv1->x >> (2 + hshift)); int x_off1 = x_off + (mv1->x >> (2 + hshift));
int y_off1 = y_off + (mv1->y >> (2 + vshift)); int y_off1 = y_off + (mv1->y >> (2 + vshift));
int idx = ff_hevc_pel_weight[block_w]; int idx = ff_hevc_pel_weight[block_w];
src1 += y_off0 * src1stride + (x_off0 << s->sps->pixel_shift); src1 += y_off0 * src1stride + (int)((unsigned)x_off0 << s->sps->pixel_shift);
src2 += y_off1 * src2stride + (x_off1 << s->sps->pixel_shift); src2 += y_off1 * src2stride + (int)((unsigned)x_off1 << s->sps->pixel_shift);
if (x_off0 < EPEL_EXTRA_BEFORE || y_off0 < EPEL_EXTRA_AFTER || if (x_off0 < EPEL_EXTRA_BEFORE || y_off0 < EPEL_EXTRA_AFTER ||
x_off0 >= pic_width - block_w - EPEL_EXTRA_AFTER || x_off0 >= pic_width - block_w - EPEL_EXTRA_AFTER ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment