From 2d6393a98d5089d52cea3353e3a9e0b52a28c3f5 Mon Sep 17 00:00:00 2001 From: Johann Date: Wed, 17 Feb 2016 17:42:07 -0800 Subject: [PATCH] Customize x86inc.asm for libvpx Use settings from vpx_config.asm Prefix functions with vpx. Change-Id: I71b4a89eaecf51fa56a07d9927081d50798a9042 --- third_party/x86inc/README.libvpx | 2 ++ third_party/x86inc/x86inc.asm | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/third_party/x86inc/README.libvpx b/third_party/x86inc/README.libvpx index 82d1a2c4d..5e9bf9433 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 b/third_party/x86inc/x86inc.asm index 094df43b6..94d85929a 100644 --- a/third_party/x86inc/x86inc.asm +++ b/third_party/x86inc/x86inc.asm @@ -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