diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2016-06-30 16:25:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-30 16:25:55 +0000 |
| commit | f7c2d2a3de1872451ce91e78c7f6b338f4e40be2 (patch) | |
| tree | f834ae3038167b242817fc43b86c5ae0708c4132 /vp9 | |
| parent | e85607410e7c3ddf50b52944972ed8a48607117b (diff) | |
| parent | f9a3d08f1b4c1a41d87d9d74b640d68e9dacda8d (diff) | |
| download | libvpx-f7c2d2a3de1872451ce91e78c7f6b338f4e40be2.tar libvpx-f7c2d2a3de1872451ce91e78c7f6b338f4e40be2.tar.gz libvpx-f7c2d2a3de1872451ce91e78c7f6b338f4e40be2.tar.bz2 libvpx-f7c2d2a3de1872451ce91e78c7f6b338f4e40be2.zip | |
Merge "Fix error in get_smooth_intra_threshold() for 10/12 bit."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 53a3ec7de..11b397cd6 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -532,10 +532,10 @@ static int get_smooth_intra_threshold(VP9_COMMON *cm) { ret_val = SMOOTH_INTRA_THRESH; break; case VPX_BITS_10: - ret_val = SMOOTH_INTRA_THRESH >> 2; + ret_val = SMOOTH_INTRA_THRESH << 4; break; case VPX_BITS_12: - ret_val = SMOOTH_INTRA_THRESH >> 4; + ret_val = SMOOTH_INTRA_THRESH << 8; break; default: assert(0 && "cm->bit_depth should be VPX_BITS_8, " |