diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 11:24:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-21 11:27:24 +0100 |
| commit | 66d79aa2e1351ac38f3469bba6a8b1fcaefa0c20 (patch) | |
| tree | c078cd42cba697c15473aeaae0a127bd0e64a74a /libavcodec/cavs.c | |
| parent | 1253091d6f7b2910f3a53ab648fb3d0cb1a4b4ee (diff) | |
| parent | 9abc80f1ed673141326341e26a05c3e1f78576d0 (diff) | |
Merge commit '9abc80f1ed673141326341e26a05c3e1f78576d0'
* commit '9abc80f1ed673141326341e26a05c3e1f78576d0':
libavcodec: Make use of av_clip functions
Conflicts:
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cavs.c')
| -rw-r--r-- | libavcodec/cavs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c index 83073901bc..10a25d8749 100644 --- a/libavcodec/cavs.c +++ b/libavcodec/cavs.c @@ -91,9 +91,9 @@ static inline int get_bs(cavs_vector *mvP, cavs_vector *mvQ, int b) } #define SET_PARAMS \ - alpha = alpha_tab[av_clip(qp_avg + h->alpha_offset, 0, 63)]; \ - beta = beta_tab[av_clip(qp_avg + h->beta_offset, 0, 63)]; \ - tc = tc_tab[av_clip(qp_avg + h->alpha_offset, 0, 63)]; + alpha = alpha_tab[av_clip_uintp2(qp_avg + h->alpha_offset, 6)]; \ + beta = beta_tab[av_clip_uintp2(qp_avg + h->beta_offset, 6)]; \ + tc = tc_tab[av_clip_uintp2(qp_avg + h->alpha_offset, 6)]; /** * in-loop deblocking filter for a single macroblock |