diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-02-28 16:25:38 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-03-01 11:06:05 -0800 |
| commit | 69c67c9531b08c1b15985b351677a162739af43e (patch) | |
| tree | 5e07512832085e972ce4bdc7e96472d2c4f5c545 /vp8/encoder/x86/dct_sse2.asm | |
| parent | db4dc6f0c0c30f56d675a489c93b22517eedb9f8 (diff) | |
| parent | a07bed2b2b2ca84fdb145ee8e4f1ca100d39915e (diff) | |
| download | libvpx-69c67c9531b08c1b15985b351677a162739af43e.tar libvpx-69c67c9531b08c1b15985b351677a162739af43e.tar.gz libvpx-69c67c9531b08c1b15985b351677a162739af43e.tar.bz2 libvpx-69c67c9531b08c1b15985b351677a162739af43e.zip | |
Merge master branch into experimental
Picks up some build system changes, compiler warning fixes, etc.
Change-Id: I2712f99e653502818a101a72696ad54018152d4e
Diffstat (limited to 'vp8/encoder/x86/dct_sse2.asm')
| -rw-r--r-- | vp8/encoder/x86/dct_sse2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/x86/dct_sse2.asm b/vp8/encoder/x86/dct_sse2.asm index d880ce0c4..d06bca592 100644 --- a/vp8/encoder/x86/dct_sse2.asm +++ b/vp8/encoder/x86/dct_sse2.asm @@ -29,7 +29,7 @@ movsxd rax, dword ptr arg(2) lea rcx, [rsi + rax*2] %else - %ifidn __OUTPUT_FORMAT__,x64 + %if LIBVPX_YASM_WIN64 %define input rcx %define output rdx %define pitch r8 @@ -53,7 +53,7 @@ RESTORE_GOT pop rbp %else - %ifidn __OUTPUT_FORMAT__,x64 + %if LIBVPX_YASM_WIN64 RESTORE_XMM %endif %endif |