diff options
| author | Daniel Kang <ddkang@google.com> | 2012-06-18 12:45:34 -0700 |
|---|---|---|
| committer | Daniel Kang <ddkang@google.com> | 2012-06-18 13:36:41 -0700 |
| commit | 31fd84d80ba058e8c5d400e8f10c6f7420900ab6 (patch) | |
| tree | ce528452c79c6b51bba8d1a3c242b75f41a04589 | |
| parent | 1f9943ab1aaeef91e54f05f0c096950b0a718e53 (diff) | |
| download | libvpx-31fd84d80ba058e8c5d400e8f10c6f7420900ab6.tar libvpx-31fd84d80ba058e8c5d400e8f10c6f7420900ab6.tar.gz libvpx-31fd84d80ba058e8c5d400e8f10c6f7420900ab6.tar.bz2 libvpx-31fd84d80ba058e8c5d400e8f10c6f7420900ab6.zip | |
x86inc: Move x86inc to the correct location.
Change-Id: I6802731a4d15feef5ce62993dc505ded55c40f7e
| -rw-r--r-- | third_party/x86inc/LICENSE | 18 | ||||
| -rw-r--r-- | third_party/x86inc/README.webm | 11 | ||||
| -rw-r--r-- | third_party/x86inc/x86inc.asm (renamed from vpx_ports/x86inc.asm) | 0 | ||||
| -rw-r--r-- | vp8/common/x86/idctllm_mmx.asm | 2 | ||||
| -rw-r--r-- | vp8/decoder/x86/dequantize_mmx.asm | 2 |
5 files changed, 31 insertions, 2 deletions
diff --git a/third_party/x86inc/LICENSE b/third_party/x86inc/LICENSE new file mode 100644 index 000000000..7d07645a1 --- /dev/null +++ b/third_party/x86inc/LICENSE @@ -0,0 +1,18 @@ +Copyright (C) 2005-2012 x264 project + +Authors: Loren Merritt <lorenm@u.washington.edu> + Anton Mitrofanov <BugMaster@narod.ru> + Jason Garrett-Glaser <darkshikari@gmail.com> + Henrik Gramner <hengar-6@student.ltu.se> + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/third_party/x86inc/README.webm b/third_party/x86inc/README.webm new file mode 100644 index 000000000..02cd9ab4e --- /dev/null +++ b/third_party/x86inc/README.webm @@ -0,0 +1,11 @@ +URL: http://git.videolan.org/?p=x264.git +Version: 999b753ff0f4dc872077f4fa90d465e948cbe656 +License: ISC +License File: LICENSE + +Description: +x264/libav's framework for x86 assembly. Contains a variety of macros and +defines that help automatically allow assembly to work cross-platform. + +Local Modifications: +Some modifications to allow PIC to work with x86inc. diff --git a/vpx_ports/x86inc.asm b/third_party/x86inc/x86inc.asm index a7066b6da..a7066b6da 100644 --- a/vpx_ports/x86inc.asm +++ b/third_party/x86inc/x86inc.asm diff --git a/vp8/common/x86/idctllm_mmx.asm b/vp8/common/x86/idctllm_mmx.asm index ab9eedbef..815ee8eb9 100644 --- a/vp8/common/x86/idctllm_mmx.asm +++ b/vp8/common/x86/idctllm_mmx.asm @@ -8,7 +8,7 @@ ; be found in the AUTHORS file in the root of the source tree. ; -%include "vpx_ports/x86inc.asm" +%include "third_party/x86inc/x86inc.asm" SECTION_RODATA align 16 diff --git a/vp8/decoder/x86/dequantize_mmx.asm b/vp8/decoder/x86/dequantize_mmx.asm index 9b53e6d92..cc5bd156c 100644 --- a/vp8/decoder/x86/dequantize_mmx.asm +++ b/vp8/decoder/x86/dequantize_mmx.asm @@ -8,7 +8,7 @@ ; be found in the AUTHORS file in the root of the source tree. ; -%include "vpx_ports/x86inc.asm" +%include "third_party/x86inc/x86inc.asm" SECTION_RODATA align 16 |