Merge commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b'

* commit 'b78b10c4b78b696927f2801cf2d9f193b4eff28b':
  avutil: Move internal CPU detection function declarations to private header

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavutil/cpu.c
Simple merge

diff --cc libavutil/cpu.h
Simple merge

diff --cc libavutil/cpu_internal.h
index 0000000000000000000000000000000000000000,2fb9ad79ea4f3e3879f5be288a624ecc099c4c3b..adbeff7c80fd01a5ca3b1f008b99fa1682301e6b
mode 000000,100644..100644
--- /dev/null
--- 2/libavutil/cpu_internal.h
+++ b/libavutil/cpu_internal.h
@@@ -1,0 -1,26 +1,26 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg 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 FFmpeg; 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 --cc libavutil/ppc/cpu.c
Simple merge

diff --cc libavutil/x86/cpu.c
Simple merge