diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-12-06 23:23:20 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-12-06 23:23:20 +0000 |
| commit | cd107896911a1a2359b29f8041458a192631292f (patch) | |
| tree | b842318a2dd28df94c87526ef4e35b5ad1c397cf | |
| parent | 5403f8576b6d323d7f1e491664f571dd14e59003 (diff) | |
| download | ffmpeg-cd107896911a1a2359b29f8041458a192631292f.tar.gz | |
move more macros to internal.h
Originally committed as revision 7239 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/common.h | 72 | ||||
| -rw-r--r-- | libavutil/internal.h | 72 |
2 files changed, 72 insertions, 72 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 3764f765fe..30cc30e7bb 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -26,10 +26,6 @@ #ifndef COMMON_H #define COMMON_H -#ifndef M_PI -#define M_PI 3.14159265358979323846 -#endif - #ifdef HAVE_AV_CONFIG_H /* only include the following when compiling package */ # include "config.h" @@ -57,74 +53,6 @@ # include <inttypes.h> -#ifndef PRId64 -#define PRId64 "lld" -#endif - -#ifndef PRIu64 -#define PRIu64 "llu" -#endif - -#ifndef PRIx64 -#define PRIx64 "llx" -#endif - -#ifndef PRIX64 -#define PRIX64 "llX" -#endif - -#ifndef PRId32 -#define PRId32 "d" -#endif - -#ifndef PRIdFAST16 -#define PRIdFAST16 PRId32 -#endif - -#ifndef PRIdFAST32 -#define PRIdFAST32 PRId32 -#endif - -#ifndef INT16_MIN -#define INT16_MIN (-0x7fff-1) -#endif - -#ifndef INT16_MAX -#define INT16_MAX 0x7fff -#endif - -#ifndef INT32_MIN -#define INT32_MIN (-0x7fffffff-1) -#endif - -#ifndef INT32_MAX -#define INT32_MAX 0x7fffffff -#endif - -#ifndef UINT32_MAX -#define UINT32_MAX 0xffffffff -#endif - -#ifndef INT64_MIN -#define INT64_MIN (-0x7fffffffffffffffLL-1) -#endif - -#ifndef INT64_MAX -#define INT64_MAX int64_t_C(9223372036854775807) -#endif - -#ifndef UINT64_MAX -#define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF) -#endif - -#ifndef INT_BIT -# if INT_MAX != 2147483647 -# define INT_BIT 64 -# else -# define INT_BIT 32 -# endif -#endif - #ifndef int64_t_C #define int64_t_C(c) (c ## LL) #define uint64_t_C(c) (c ## ULL) diff --git a/libavutil/internal.h b/libavutil/internal.h index e31e9b213c..bf7d0ebca3 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -50,6 +50,78 @@ #endif #endif +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif + +#ifndef PRId64 +#define PRId64 "lld" +#endif + +#ifndef PRIu64 +#define PRIu64 "llu" +#endif + +#ifndef PRIx64 +#define PRIx64 "llx" +#endif + +#ifndef PRIX64 +#define PRIX64 "llX" +#endif + +#ifndef PRId32 +#define PRId32 "d" +#endif + +#ifndef PRIdFAST16 +#define PRIdFAST16 PRId32 +#endif + +#ifndef PRIdFAST32 +#define PRIdFAST32 PRId32 +#endif + +#ifndef INT16_MIN +#define INT16_MIN (-0x7fff-1) +#endif + +#ifndef INT16_MAX +#define INT16_MAX 0x7fff +#endif + +#ifndef INT32_MIN +#define INT32_MIN (-0x7fffffff-1) +#endif + +#ifndef INT32_MAX +#define INT32_MAX 0x7fffffff +#endif + +#ifndef UINT32_MAX +#define UINT32_MAX 0xffffffff +#endif + +#ifndef INT64_MIN +#define INT64_MIN (-0x7fffffffffffffffLL-1) +#endif + +#ifndef INT64_MAX +#define INT64_MAX int64_t_C(9223372036854775807) +#endif + +#ifndef UINT64_MAX +#define UINT64_MAX uint64_t_C(0xFFFFFFFFFFFFFFFF) +#endif + +#ifndef INT_BIT +# if INT_MAX != 2147483647 +# define INT_BIT 64 +# else +# define INT_BIT 32 +# endif +#endif + #if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC) # define PIC #endif |