On Mon, 20 Jan 2014 11:25:32 +0100, Luca Barbato <[email protected]> wrote: > From: Michael Niedermayer <[email protected]> > > Keep qp fields within the range. > > Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > Signed-off-by: Luca Barbato <[email protected]> > --- > libavcodec/hevc.c | 4 ++-- > libavcodec/hevc_filter.c | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c > index 438794d..d5175f5 100644 > --- a/libavcodec/hevc.c > +++ b/libavcodec/hevc.c > @@ -771,8 +771,8 @@ static int hls_slice_header(HEVCContext *s) > s->HEVClc.first_qp_group = !s->sh.dependent_slice_segment_flag; > > if (!s->pps->cu_qp_delta_enabled_flag) > - s->HEVClc.qp_y = ((s->sh.slice_qp + 52 + 2 * s->sps->qp_bd_offset) % > - (52 + s->sps->qp_bd_offset)) - > s->sps->qp_bd_offset; > + s->HEVClc.qp_y = FFUMOD(s->sh.slice_qp + 52 + 2 * > s->sps->qp_bd_offset, > + 52 + s->sps->qp_bd_offset) - > s->sps->qp_bd_offset; > > s->slice_initialized = 1; > > diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c > index bb1e360..f3c6554 100644 > --- a/libavcodec/hevc_filter.c > +++ b/libavcodec/hevc_filter.c > @@ -158,8 +158,8 @@ void ff_hevc_set_qPy(HEVCContext *s, int xC, int yC, > > if (s->HEVClc.tu.cu_qp_delta != 0) { > int off = s->sps->qp_bd_offset; > - s->HEVClc.qp_y = ((qp_y + s->HEVClc.tu.cu_qp_delta + 52 + 2 * off) % > - (52 + off)) - off; > + s->HEVClc.qp_y = FFUMOD(qp_y + s->HEVClc.tu.cu_qp_delta + 52 + 2 * > off, > + 52 + off) - off; > } else > s->HEVClc.qp_y = qp_y; > } > -- > 1.8.5.1 >
Ok, assuming the macro names are fixed as requested for the previous patch. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
