From 35747296b0cde0c10cf2013fb3f7afd7480aa44e Mon Sep 17 00:00:00 2001 From: Johann Date: Tue, 28 Jul 2015 14:30:07 -0700 Subject: [PATCH] Customize x86inc.asm for libvpx Use settings from vpx_config.asm Prefix functions with vpx. Change-Id: I1091d9b063e9f5af0dce554bb636ee894c05dcf7 --- third_party/x86inc/README.libvpx | 2 ++ third_party/x86inc/x86inc.asm.new | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx index bdee5f9fa..fcb49e16c 100644 --- a/third_party/x86inc/README.libvpx +++ b/third_party/x86inc/README.libvpx @@ -8,3 +8,5 @@ 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: +Get configuration from vpx_config.asm. +Prefix functions with vpx by default. diff --git a/third_party/x86inc/x86inc.asm.new b/third_party/x86inc/x86inc.asm.new index d897fa471..fbd95a632 100644 --- a/third_party/x86inc/x86inc.asm.new +++ b/third_party/x86inc/x86inc.asm.new @@ -34,8 +34,10 @@ ; as this feature might be useful for others as well. Send patches or ideas ; to x264-devel@videolan.org . +%include "vpx_config.asm" + %ifndef private_prefix - %define private_prefix x264 + %define private_prefix vpx %endif %ifndef public_prefix