Commit 001ea567 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit 'a1926a29'

* commit 'a1926a29':
  hevc: avoid invalid shifts of negative values
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents fea15636 a1926a29
...@@ -1331,7 +1331,7 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride, ...@@ -1331,7 +1331,7 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst, ptrdiff_t dststride,
x_off += mv->x >> 2; x_off += mv->x >> 2;
y_off += mv->y >> 2; y_off += mv->y >> 2;
src += y_off * srcstride + x_off * (1 << s->ps.sps->pixel_shift); src += y_off * srcstride + (x_off * (1 << s->ps.sps->pixel_shift));
if (x_off < QPEL_EXTRA_BEFORE || y_off < QPEL_EXTRA_AFTER || if (x_off < QPEL_EXTRA_BEFORE || y_off < QPEL_EXTRA_AFTER ||
x_off >= pic_width - block_w - QPEL_EXTRA_AFTER || x_off >= pic_width - block_w - QPEL_EXTRA_AFTER ||
...@@ -1486,7 +1486,7 @@ static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0, ...@@ -1486,7 +1486,7 @@ static void chroma_mc_uni(HEVCContext *s, uint8_t *dst0,
x_off += mv->x >> (2 + hshift); x_off += mv->x >> (2 + hshift);
y_off += mv->y >> (2 + vshift); y_off += mv->y >> (2 + vshift);
src0 += y_off * srcstride + x_off * (1 << s->ps.sps->pixel_shift); src0 += y_off * srcstride + (x_off * (1 << s->ps.sps->pixel_shift));
if (x_off < EPEL_EXTRA_BEFORE || y_off < EPEL_EXTRA_AFTER || if (x_off < EPEL_EXTRA_BEFORE || y_off < EPEL_EXTRA_AFTER ||
x_off >= pic_width - block_w - EPEL_EXTRA_AFTER || x_off >= 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