Commit b78b10c4 authored by Diego Biurrun's avatar Diego Biurrun

avutil: Move internal CPU detection function declarations to private header

parent 91d4cfb8
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/cpu_internal.h"
#include "config.h" #include "config.h"
#define CORE_FLAG(f) \ #define CORE_FLAG(f) \
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
*/ */
#include "cpu.h" #include "cpu.h"
#include "cpu_internal.h"
#include "config.h" #include "config.h"
#include "opt.h" #include "opt.h"
#include "common.h" #include "common.h"
......
...@@ -81,9 +81,4 @@ int av_parse_cpu_flags(const char *s); ...@@ -81,9 +81,4 @@ int av_parse_cpu_flags(const char *s);
*/ */
int av_cpu_count(void); 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 */ #endif /* AVUTIL_CPU_H */
/*
* 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 */
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#endif /* __APPLE__ */ #endif /* __APPLE__ */
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/cpu_internal.h"
#include "config.h" #include "config.h"
/** /**
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/cpu_internal.h"
#if HAVE_YASM #if HAVE_YASM
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment