diff options
author | clsid2 <clsid2@users.sourceforge.net> | 2010-01-10 20:54:22 +0300 |
---|---|---|
committer | clsid2 <clsid2@users.sourceforge.net> | 2010-01-10 20:54:22 +0300 |
commit | a383d75ab7c1546e4b9580498ce365820f0b9e2f (patch) | |
tree | aceec229d98a86a893f39ec63ad3a3187dcfcf7e /src/filters/transform/mpcvideodec/ffmpeg | |
parent | bdd4f41ffadd2d99082509e0341884e55b821ada (diff) |
Separate config.h for libswscale
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1501 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/mpcvideodec/ffmpeg')
5 files changed, 69 insertions, 29 deletions
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/config.h b/src/filters/transform/mpcvideodec/ffmpeg/config.h index 0608274e9..f006770e2 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/config.h +++ b/src/filters/transform/mpcvideodec/ffmpeg/config.h @@ -1,28 +1,21 @@ #ifdef __GNUC__
#define HAVE_INLINE_ASM 1
#define HAVE_MMX 1
- #define HAVE_MMX2 1
#define HAVE_SSE 1
- #define HAVE_SSE2 1
#define HAVE_SSSE3 1
#define HAVE_AMD3DNOW 1
#define HAVE_AMD3DNOWEXT 1
- #define HAVE_AMD3DNOWEX 1
#define ARCH_X86 1
#ifdef ARCH_X86_64
#define HAVE_FAST_64BIT 1
#define HAVE_CMOV 1
#define HAVE_FAST_CMOV 1
- #else
- #define ARCH_X86_32 1
#endif
#else
#define HAVE_INLINE_ASM 0
#define HAVE_MMX 0
- #define HAVE_MMX2 0
#define HAVE_SSE 0
- #define HAVE_SSE2 0
#define HAVE_SSSE3 0
#define HAVE_AMD3DNOW 0
#define HAVE_AMD3DNOWEXT 0
@@ -52,19 +45,6 @@ #define EMULATE_FAST_INT
#endif
-#ifndef __GNUC__
- #define inline __inline
- #ifndef __attribute__
- #define __attribute__(x) /**/
- #endif
- #pragma warning (disable:4002)
- #include <malloc.h>
- #define memalign(a,b) _aligned_malloc(b,a)
-#else
- #define memalign(a,b) __mingw_aligned_malloc(b,a)
-#endif
-
-
#define HAVE_BSWAP 1
#define HAVE_MALLOC_H 1
#define HAVE_MEMALIGN 1
@@ -74,8 +54,6 @@ #define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t"
-#define CONFIG_GPL 1
-
//#define CONFIG_AUDIO_NONSHORT 1
#define CONFIG_HARDCODED_TABLES 0
#define CONFIG_GPL 1
@@ -243,7 +221,3 @@ #define CONFIG_MPEGAUDIO_PARSER 0
#define CONFIG_MPEG4VIDEO_PARSER 0
#define CONFIG_MLP_PARSER 1
-
-#define CONFIG_SWSCALE_ALPHA 1
-#define RUNTIME_CPUDETECT 1
-#define USE_FASTMEMCPY 1
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libswscale/config.h b/src/filters/transform/mpcvideodec/ffmpeg/libswscale/config.h new file mode 100644 index 000000000..fad24058f --- /dev/null +++ b/src/filters/transform/mpcvideodec/ffmpeg/libswscale/config.h @@ -0,0 +1,66 @@ +#ifdef __GNUC__
+ #define HAVE_MMX 1
+ #define HAVE_MMX2 1
+ #define HAVE_SSE 1
+ #define HAVE_SSE2 1
+ #define HAVE_SSSE3 1
+ #define HAVE_AMD3DNOW 1
+ #define HAVE_AMD3DNOWEX 1
+
+ #define ARCH_X86 1
+ #ifdef ARCH_X86_64
+ #define HAVE_FAST_64BIT 1
+ #define HAVE_CMOV 1
+ #define HAVE_FAST_CMOV 1
+ #else
+ #define ARCH_X86_32 1
+ #endif
+#else
+ #define HAVE_INLINE_ASM 0
+ #define HAVE_MMX 0
+ #define HAVE_MMX2 0
+ #define HAVE_SSE 0
+ #define HAVE_SSE2 0
+ #define HAVE_SSSE3 0
+ #define HAVE_AMD3DNOW 0
+ #define HAVE_AMD3DNOWEXT 0
+ #define ARCH_X86 0
+ #define ARCH_X86_32 0
+ #define ARCH_X86_64 0
+ #define HAVE_FAST_64BIT 0
+ #define HAVE_CMOV 0
+ #define HAVE_FAST_CMOV 0
+#endif
+
+#define HAVE_TEN_OPERANDS 1
+#define HAVE_EBP_AVAILABLE 1
+#define HAVE_EBX_AVAILABLE 1
+#define NAMED_ASM_ARGS 1
+
+#define HAVE_ALLOCA_H 1
+#define HAVE_BSWAP 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMALIGN 1
+#define HAVE_THREADS 1
+#define RUNTIME_CPUDETECT 1
+#define USE_FASTMEMCPY 1
+#define CONFIG_SWSCALE_ALPHA 1
+
+#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\n\t"
+
+#define CONFIG_GPL 1
+
+/* Toggles debugging informations */
+#undef MP_DEBUG
+
+#ifndef __GNUC__
+ #define inline __inline
+ #ifndef __attribute__
+ #define __attribute__(x) /**/
+ #endif
+ #pragma warning (disable:4002)
+ #include <malloc.h>
+ #define memalign(a,b) _aligned_malloc(b,a)
+#else
+ #define memalign(a,b) __mingw_aligned_malloc(b,a)
+#endif
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libvo/aclib.c b/src/filters/transform/mpcvideodec/ffmpeg/libvo/aclib.c index 941d78776..55145d679 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libvo/aclib.c +++ b/src/filters/transform/mpcvideodec/ffmpeg/libvo/aclib.c @@ -9,7 +9,7 @@ */
#include <string.h>
#include <stddef.h>
-#include "config.h"
+#include "../libswscale/config.h"
#include "../libavutil/x86_cpu.h"
#include "../cpudetect.h"
#include "fastmemcpy.h"
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libvo/fastmemcpy.h b/src/filters/transform/mpcvideodec/ffmpeg/libvo/fastmemcpy.h index 3d71ebfce..0dd2ff62c 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libvo/fastmemcpy.h +++ b/src/filters/transform/mpcvideodec/ffmpeg/libvo/fastmemcpy.h @@ -2,7 +2,7 @@ #define __MPLAYER_MEMCPY
#include <stddef.h>
-#include "../config.h"
+#include "../libswscale/config.h"
#include "../libavutil/internal.h"
#if defined(USE_FASTMEMCPY) && (HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_SSE || HAVE_SSE2)
diff --git a/src/filters/transform/mpcvideodec/ffmpeg/libvo/libvoinit.c b/src/filters/transform/mpcvideodec/ffmpeg/libvo/libvoinit.c index cea265343..31d8d3a4e 100644 --- a/src/filters/transform/mpcvideodec/ffmpeg/libvo/libvoinit.c +++ b/src/filters/transform/mpcvideodec/ffmpeg/libvo/libvoinit.c @@ -1,5 +1,5 @@ #include "cpudetect.h"
-#include "config.h"
+#include "../libswscale/config.h"
#include <string.h>
#include "fastmemcpy.h"
#include "../compiler.h"
|