From 012f73e271638430e035ca68f5803dc2356d6a3e Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 30 Oct 2012 02:54:25 +0100 Subject: x86inc: Only define program_name if the macro is unset This allows overriding the value from outside of the file. --- libavutil/x86/x86inc.asm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavutil/x86') diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 1fe9f5550c..b0df2b20f0 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -34,7 +34,9 @@ ; as this feature might be useful for others as well. Send patches or ideas ; to x264-devel@videolan.org . -%define program_name ff +%ifndef program_name + %define program_name ff +%endif %define WIN64 0 %define UNIX64 0 -- cgit v1.2.3 From 61bc2bc7d428cafe45f6d9ab40e6c05262d307e9 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 30 Oct 2012 01:11:14 +0100 Subject: x86util: Add cpuflags_mmxext alias for cpuflags_mmx2 "mmxext" is a more sensible name and more common in outside projects. --- libavutil/x86/x86util.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavutil/x86') diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 4c6f4c63ab..761cea0a8e 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -23,6 +23,8 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** +%define cpuflags_mmxext cpuflags_mmx2 + %include "libavutil/x86/x86inc.asm" %macro SBUTTERFLY 4 -- cgit v1.2.3