virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

move more macros to internal.h

Browse Source 
Originally committed as revision 7239 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-12-06 23:23:20 +00:00
parent 5403f8576b
commit cd10789691
2 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
libavutil/common.h
View File

@ -26,10 +26,6 @@
#ifndef COMMON_H #ifndef COMMON_H
#define COMMON_H #define COMMON_H
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
#ifdef HAVE_AV_CONFIG_H #ifdef HAVE_AV_CONFIG_H
/* only include the following when compiling package */ /* only include the following when compiling package */
# include "config.h" # include "config.h"
@ -57,74 +53,6 @@
# include <inttypes.h> # 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 #ifndef int64_t_C
#define int64_t_C(c) (c ## LL) #define int64_t_C(c) (c ## LL)
#define uint64_t_C(c) (c ## ULL) #define uint64_t_C(c) (c ## ULL)

72
libavutil/internal.h
View File

@ -50,6 +50,78 @@
#endif #endif
#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) #if ( defined(__PIC__) || defined(__pic__) ) && ! defined(PIC)
# define PIC # define PIC
#endif #endif