diff options
| author | Johann <johann.koenig@duck.com> | 2013-04-26 13:35:28 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-26 13:35:28 -0700 |
| commit | 9e23bd5df57cb3295118ca83543ce1b6f226465b (patch) | |
| tree | 6299bc5f91fde2001ce367e17e5fa10ef3164fa3 /vp9/encoder/vp9_dct.c | |
| parent | eea1fecd069c2eaaf17b09f4306d0970c893a12d (diff) | |
| parent | 32a5c52856743c5cce39f73bfc3e6aa77527a8c5 (diff) | |
| download | libvpx-9e23bd5df57cb3295118ca83543ce1b6f226465b.tar libvpx-9e23bd5df57cb3295118ca83543ce1b6f226465b.tar.gz libvpx-9e23bd5df57cb3295118ca83543ce1b6f226465b.tar.bz2 libvpx-9e23bd5df57cb3295118ca83543ce1b6f226465b.zip | |
Merge "Merge branch 'master' into experimental" into experimental
Diffstat (limited to 'vp9/encoder/vp9_dct.c')
| -rw-r--r-- | vp9/encoder/vp9_dct.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_dct.c b/vp9/encoder/vp9_dct.c index ecd3e2dd3..ebf40e4e6 100644 --- a/vp9/encoder/vp9_dct.c +++ b/vp9/encoder/vp9_dct.c @@ -1286,4 +1286,3 @@ void vp9_short_fdct32x32_c(int16_t *input, int16_t *out, int pitch) { out[j + i * 32] = (temp_out[j] + 1 + (temp_out[j] < 0)) >> 2; } } - |