From 6860b4081d046558c44b1b42f22022ea341a2a73 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 8 Jul 2012 01:20:48 +0200 Subject: x86: include x86inc.asm in x86util.asm This is necessary to allow refactoring some x86util macros with cpuflags. --- libavutil/x86/cpuid.asm | 2 +- libavutil/x86/float_dsp.asm | 1 - libavutil/x86/x86util.asm | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'libavutil/x86') diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm index d2ac1f01dc..e739ebe31f 100644 --- a/libavutil/x86/cpuid.asm +++ b/libavutil/x86/cpuid.asm @@ -21,7 +21,7 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** -%include "x86inc.asm" +%include "x86util.asm" SECTION .text diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm index 5b9b444676..bbc9a8b5e2 100644 --- a/libavutil/x86/float_dsp.asm +++ b/libavutil/x86/float_dsp.asm @@ -18,7 +18,6 @@ ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;****************************************************************************** -%include "x86inc.asm" %include "x86util.asm" SECTION .text diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index a5d89a187a..3aac639543 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 ;****************************************************************************** +%include "x86inc.asm" + %macro SBUTTERFLY 4 %if avx_enabled == 0 mova m%4, m%2 -- cgit v1.2.3