summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaowu Xu <yaowu@google.com>2013-02-01 05:57:41 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-02-01 05:57:41 -0800
commitc1f611be74b63c4a930d8640a16bae6c9156677a (patch)
tree9da29705d3f2c9255b489e8781e30e55755c811d
parentc94e55add0ac2683b12e14540b8d0f2ffdd81055 (diff)
parentab1cad9bdd339ada3c80c7ba061e06e760573edf (diff)
downloadlibvpx-c1f611be74b63c4a930d8640a16bae6c9156677a.tar
libvpx-c1f611be74b63c4a930d8640a16bae6c9156677a.tar.gz
libvpx-c1f611be74b63c4a930d8640a16bae6c9156677a.tar.bz2
libvpx-c1f611be74b63c4a930d8640a16bae6c9156677a.zip
Merge "fix a small bug in 16 point forward dct" into experimental
-rw-r--r--vp9/encoder/vp9_dct.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_dct.c b/vp9/encoder/vp9_dct.c
index bfde02ccb..32e7b3fbc 100644
--- a/vp9/encoder/vp9_dct.c
+++ b/vp9/encoder/vp9_dct.c
@@ -1288,7 +1288,7 @@ static void dct16x16_1d(int16_t input[16], int16_t output[16],
output[15] = (intermediate[11] + intermediate[12] + output_rounding)
>> output_shift;
- output[ 1] = -(intermediate[11] - intermediate[12] + output_rounding)
+ output[ 1] = (intermediate[12] - intermediate[11] + output_rounding)
>> output_shift;
output[ 7] = (2 * (intermediate[13] * C8) + final_rounding) >> final_shift;