| 12345678910111213141516171819202122232425262728293031323334 |
- --- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h 2016-02-20 16:21:19.000000000 +0100
- +++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h 2016-03-19 18:38:18.594026700 +0100
- @@ -24,7 +24,6 @@
- #include "utils/CPUInfo.h"
-
- extern "C" {
- -#include "libswscale/swscale.h"
- #include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
- #include "libavutil/avutil.h"
- @@ -33,23 +32,6 @@ extern "C" {
- #include "libpostproc/postprocess.h"
- }
-
- -inline int SwScaleCPUFlags()
- -{
- - unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
- - int flags = 0;
- -
- - if (cpuFeatures & CPU_FEATURE_MMX)
- - flags |= SWS_CPU_CAPS_MMX;
- - if (cpuFeatures & CPU_FEATURE_MMX2)
- - flags |= SWS_CPU_CAPS_MMX2;
- - if (cpuFeatures & CPU_FEATURE_3DNOW)
- - flags |= SWS_CPU_CAPS_3DNOW;
- - if (cpuFeatures & CPU_FEATURE_ALTIVEC)
- - flags |= SWS_CPU_CAPS_ALTIVEC;
- -
- - return flags;
- -}
- -
- inline int PPCPUFlags()
- {
- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
|
