aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/x86/cpu.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-29 14:04:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-29 14:05:15 +0200
commitc83d794936b2adacbdd7fee12cf14439a9ed2689 (patch)
tree19bec339467dd18ef5fffb164a6172d6d36c089f /libavutil/x86/cpu.c
parent18a9deedb0b0da2d6675e14ecbb270477b7186b7 (diff)
parentb78b10c4b78b696927f2801cf2d9f193b4eff28b (diff)
downloadffmpeg-c83d794936b2adacbdd7fee12cf14439a9ed2689.tar.gz
Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'
* commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b': avutil: Move internal CPU detection function declarations to private header Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/cpu.c')
-rw-r--r--libavutil/x86/cpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index a3a5239159..81bb15a0a4 100644
--- a/libavutil/x86/cpu.c
+++ b/libavutil/x86/cpu.c
@@ -26,6 +26,7 @@
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "libavutil/cpu.h"
+#include "libavutil/cpu_internal.h"
#if HAVE_YASM