From b78b10c4b78b696927f2801cf2d9f193b4eff28b Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Tue, 20 Aug 2013 17:49:01 +0200
Subject: avutil: Move internal CPU detection function declarations to private
 header

---
 libavutil/arm/cpu.c      |  1 +
 libavutil/cpu.c          |  1 +
 libavutil/cpu.h          |  5 -----
 libavutil/cpu_internal.h | 26 ++++++++++++++++++++++++++
 libavutil/ppc/cpu.c      |  1 +
 libavutil/x86/cpu.c      |  1 +
 6 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 libavutil/cpu_internal.h

diff --git a/libavutil/arm/cpu.c b/libavutil/arm/cpu.c
index b4aabc375e..85ea662d94 100644
--- a/libavutil/arm/cpu.c
+++ b/libavutil/arm/cpu.c
@@ -17,6 +17,7 @@
  */
 
 #include "libavutil/cpu.h"
+#include "libavutil/cpu_internal.h"
 #include "config.h"
 
 #define CORE_FLAG(f) \
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
index 6384d6d7e7..8edebbceed 100644
--- a/libavutil/cpu.c
+++ b/libavutil/cpu.c
@@ -17,6 +17,7 @@
  */
 
 #include "cpu.h"
+#include "cpu_internal.h"
 #include "config.h"
 #include "opt.h"
 #include "common.h"
diff --git a/libavutil/cpu.h b/libavutil/cpu.h
index f2c9c0f20e..8f2af28543 100644
--- a/libavutil/cpu.h
+++ b/libavutil/cpu.h
@@ -81,9 +81,4 @@ int av_parse_cpu_flags(const char *s);
  */
 int av_cpu_count(void);
 
-/* The following CPU-specific functions shall not be called directly. */
-int ff_get_cpu_flags_arm(void);
-int ff_get_cpu_flags_ppc(void);
-int ff_get_cpu_flags_x86(void);
-
 #endif /* AVUTIL_CPU_H */
diff --git a/libavutil/cpu_internal.h b/libavutil/cpu_internal.h
new file mode 100644
index 0000000000..2fb9ad79ea
--- /dev/null
+++ b/libavutil/cpu_internal.h
@@ -0,0 +1,26 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVUTIL_CPU_INTERNAL_H
+#define AVUTIL_CPU_INTERNAL_H
+
+int ff_get_cpu_flags_arm(void);
+int ff_get_cpu_flags_ppc(void);
+int ff_get_cpu_flags_x86(void);
+
+#endif /* AVUTIL_CPU_INTERNAL_H */
diff --git a/libavutil/ppc/cpu.c b/libavutil/ppc/cpu.c
index 002571161a..50107e1fca 100644
--- a/libavutil/ppc/cpu.c
+++ b/libavutil/ppc/cpu.c
@@ -29,6 +29,7 @@
 #endif /* __APPLE__ */
 
 #include "libavutil/cpu.h"
+#include "libavutil/cpu_internal.h"
 #include "config.h"
 
 /**
diff --git a/libavutil/x86/cpu.c b/libavutil/x86/cpu.c
index 3b36fd0fb1..3e946b8dc2 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
 
-- 
cgit v1.2.3