diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-07-08 01:20:48 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-10-31 00:37:42 +0100 |
| commit | 6860b4081d046558c44b1b42f22022ea341a2a73 (patch) | |
| tree | 00d50625ee0e802a31d76e3cef6ba132905c700c /libavutil/x86 | |
| parent | ab9545a290d1f48eb4c361ecd0b5df0a966a9a79 (diff) | |
x86: include x86inc.asm in x86util.asm
This is necessary to allow refactoring some x86util macros with cpuflags.
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/cpuid.asm | 2 | ||||
| -rw-r--r-- | libavutil/x86/float_dsp.asm | 1 | ||||
| -rw-r--r-- | libavutil/x86/x86util.asm | 2 |
3 files changed, 3 insertions, 2 deletions
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 |