diff options
| author | Mickaël Raulet <mraulet@insa-rennes.fr> | 2014-04-26 15:35:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-06 18:22:34 +0200 |
| commit | 83976e40e89655162e5394cf8915d9b6d89702d9 (patch) | |
| tree | 12575120367c9f98a2b535a349ac09cbe70d6ecd /libavcodec/hevc_cabac.c | |
| parent | 760a9ef451847b0e76dd6c825621ff277079c61b (diff) | |
| download | ffmpeg-83976e40e89655162e5394cf8915d9b6d89702d9.tar.gz | |
hevc: C code update for new motion compensation
pretty print C
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_cabac.c')
| -rw-r--r-- | libavcodec/hevc_cabac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 7d04eda0c6..288f88576c 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -537,7 +537,7 @@ static void cabac_init_state(HEVCContext *s) int init_value = init_values[init_type][i]; int m = (init_value >> 4) * 5 - 45; int n = ((init_value & 15) << 3) - 16; - int pre = 2 * (((m * av_clip_c(s->sh.slice_qp, 0, 51)) >> 4) + n) - 127; + int pre = 2 * (((m * av_clip(s->sh.slice_qp, 0, 51)) >> 4) + n) - 127; pre ^= pre >> 31; if (pre > 124) @@ -1114,7 +1114,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, else offset = s->pps->cr_qp_offset + s->sh.slice_cr_qp_offset; - qp_i = av_clip_c(qp_y + offset, - s->sps->qp_bd_offset, 57); + qp_i = av_clip(qp_y + offset, - s->sps->qp_bd_offset, 57); if (qp_i < 30) qp = qp_i; else if (qp_i > 43) |