summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-08-08 13:51:52 +0100
committerMans Rullgard <mans@mansr.com>2012-08-09 00:58:20 +0100
commitc318626ce248e55df032146b16e8e0f4ed1d99fb (patch)
tree86039fb1b5e69e04487a3f219075cd0df9fa3fa4 /libavutil
parent122d5c526a43122b1f9ac9bce79e3938c8354e43 (diff)
x86: rename libavutil/x86_cpu.h to libavutil/x86/asm.h
This puts x86-specific things in the x86/ subdirectory where they belong. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/x86/asm.h (renamed from libavutil/x86_cpu.h)6
-rw-r--r--libavutil/x86/cpu.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/x86_cpu.h b/libavutil/x86/asm.h
index f84eba67f5..b447fabb57 100644
--- a/libavutil/x86_cpu.h
+++ b/libavutil/x86/asm.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVUTIL_X86_CPU_H
-#define AVUTIL_X86_CPU_H
+#ifndef AVUTIL_X86_ASM_H
+#define AVUTIL_X86_ASM_H
#include <stdint.h>
#include "config.h"
@@ -95,4 +95,4 @@ typedef int x86_reg;
# define XMM_CLOBBERS_ONLY(...)
#endif
-#endif /* AVUTIL_X86_CPU_H */
+#endif /* AVUTIL_X86_ASM_H */
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index a63b564985..645bb83f77 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
-#include "libavutil/x86_cpu.h"
+#include "libavutil/x86/asm.h"
#include "libavutil/cpu.h"
#if HAVE_INLINE_ASM