diff options
Diffstat (limited to 'apps/codecs/libcook/libavutil')
-rw-r--r-- | apps/codecs/libcook/libavutil/avutil.h | 8 | ||||
-rw-r--r-- | apps/codecs/libcook/libavutil/bswap.h | 2 | ||||
-rw-r--r-- | apps/codecs/libcook/libavutil/common.h | 6 | ||||
-rw-r--r-- | apps/codecs/libcook/libavutil/internal.h | 12 | ||||
-rw-r--r-- | apps/codecs/libcook/libavutil/intreadwrite.h | 2 | ||||
-rw-r--r-- | apps/codecs/libcook/libavutil/mem.c | 1 |
6 files changed, 15 insertions, 16 deletions
diff --git a/apps/codecs/libcook/libavutil/avutil.h b/apps/codecs/libcook/libavutil/avutil.h index c57e69f10c..c07e44d660 100644 --- a/apps/codecs/libcook/libavutil/avutil.h +++ b/apps/codecs/libcook/libavutil/avutil.h | |||
@@ -54,10 +54,10 @@ | |||
54 | unsigned avutil_version(void); | 54 | unsigned avutil_version(void); |
55 | 55 | ||
56 | #include "common.h" | 56 | #include "common.h" |
57 | #include "mathematics.h" | 57 | //#include "mathematics.h" |
58 | #include "rational.h" | 58 | //#include "rational.h" |
59 | #include "intfloat_readwrite.h" | 59 | //#include "intfloat_readwrite.h" |
60 | #include "log.h" | 60 | #include "log.h" |
61 | #include "pixfmt.h" | 61 | //#include "pixfmt.h" |
62 | 62 | ||
63 | #endif /* AVUTIL_AVUTIL_H */ | 63 | #endif /* AVUTIL_AVUTIL_H */ |
diff --git a/apps/codecs/libcook/libavutil/bswap.h b/apps/codecs/libcook/libavutil/bswap.h index cf68c43c72..9175cb24a5 100644 --- a/apps/codecs/libcook/libavutil/bswap.h +++ b/apps/codecs/libcook/libavutil/bswap.h | |||
@@ -27,7 +27,7 @@ | |||
27 | #define AVUTIL_BSWAP_H | 27 | #define AVUTIL_BSWAP_H |
28 | 28 | ||
29 | #include <stdint.h> | 29 | #include <stdint.h> |
30 | #include "config.h" | 30 | //#include "ffmpeg_config.h" |
31 | #include "common.h" | 31 | #include "common.h" |
32 | 32 | ||
33 | #if ARCH_ARM | 33 | #if ARCH_ARM |
diff --git a/apps/codecs/libcook/libavutil/common.h b/apps/codecs/libcook/libavutil/common.h index 15eaf9849d..949f093d35 100644 --- a/apps/codecs/libcook/libavutil/common.h +++ b/apps/codecs/libcook/libavutil/common.h | |||
@@ -278,9 +278,9 @@ static inline av_const float av_clipf(float a, float amin, float amax) | |||
278 | 278 | ||
279 | #include "mem.h" | 279 | #include "mem.h" |
280 | 280 | ||
281 | #ifdef HAVE_AV_CONFIG_H | 281 | //#ifdef HAVE_AV_CONFIG_H |
282 | # include "config.h" | 282 | //# include "ffmpeg_config.h" |
283 | # include "internal.h" | 283 | # include "internal.h" |
284 | #endif /* HAVE_AV_CONFIG_H */ | 284 | //#endif /* HAVE_AV_CONFIG_H */ |
285 | 285 | ||
286 | #endif /* AVUTIL_COMMON_H */ | 286 | #endif /* AVUTIL_COMMON_H */ |
diff --git a/apps/codecs/libcook/libavutil/internal.h b/apps/codecs/libcook/libavutil/internal.h index 4191aa8e52..f8f9418a76 100644 --- a/apps/codecs/libcook/libavutil/internal.h +++ b/apps/codecs/libcook/libavutil/internal.h | |||
@@ -34,10 +34,10 @@ | |||
34 | #include <stdint.h> | 34 | #include <stdint.h> |
35 | #include <stddef.h> | 35 | #include <stddef.h> |
36 | #include <assert.h> | 36 | #include <assert.h> |
37 | #include "config.h" | 37 | //#include "ffmpeg_config.h" |
38 | #include "common.h" | 38 | #include "common.h" |
39 | #include "mem.h" | 39 | #include "mem.h" |
40 | #include "timer.h" | 40 | //#include "timer.h" |
41 | 41 | ||
42 | #ifndef attribute_align_arg | 42 | #ifndef attribute_align_arg |
43 | #if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2) | 43 | #if (!defined(__ICC) || __ICC > 1100) && AV_GCC_VERSION_AT_LEAST(4,2) |
@@ -223,10 +223,10 @@ if((y)<(x)){\ | |||
223 | #define realloc please_use_av_realloc | 223 | #define realloc please_use_av_realloc |
224 | #undef time | 224 | #undef time |
225 | #define time time_is_forbidden_due_to_security_issues | 225 | #define time time_is_forbidden_due_to_security_issues |
226 | #undef rand | 226 | //#undef rand |
227 | #define rand rand_is_forbidden_due_to_state_trashing_use_av_random | 227 | //#define rand rand_is_forbidden_due_to_state_trashing_use_av_random |
228 | #undef srand | 228 | //#undef srand |
229 | #define srand srand_is_forbidden_due_to_state_trashing_use_av_random_init | 229 | //#define srand srand_is_forbidden_due_to_state_trashing_use_av_random_init |
230 | #undef random | 230 | #undef random |
231 | #define random random_is_forbidden_due_to_state_trashing_use_av_random | 231 | #define random random_is_forbidden_due_to_state_trashing_use_av_random |
232 | #undef sprintf | 232 | #undef sprintf |
diff --git a/apps/codecs/libcook/libavutil/intreadwrite.h b/apps/codecs/libcook/libavutil/intreadwrite.h index 7c5909ea51..d27a50061e 100644 --- a/apps/codecs/libcook/libavutil/intreadwrite.h +++ b/apps/codecs/libcook/libavutil/intreadwrite.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #define AVUTIL_INTREADWRITE_H | 20 | #define AVUTIL_INTREADWRITE_H |
21 | 21 | ||
22 | #include <stdint.h> | 22 | #include <stdint.h> |
23 | #include "config.h" | 23 | //#include "ffmpeg_config.h" |
24 | #include "bswap.h" | 24 | #include "bswap.h" |
25 | 25 | ||
26 | #ifdef __GNUC__ | 26 | #ifdef __GNUC__ |
diff --git a/apps/codecs/libcook/libavutil/mem.c b/apps/codecs/libcook/libavutil/mem.c index 741450b53f..7307df2384 100644 --- a/apps/codecs/libcook/libavutil/mem.c +++ b/apps/codecs/libcook/libavutil/mem.c | |||
@@ -24,7 +24,6 @@ | |||
24 | * default memory allocator for libavutil | 24 | * default memory allocator for libavutil |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "config.h" | ||
28 | 27 | ||
29 | #include <limits.h> | 28 | #include <limits.h> |
30 | #include <stdlib.h> | 29 | #include <stdlib.h> |