diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavutil/common.h | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
| download | ffmpeg-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/common.h')
| -rw-r--r-- | libavutil/common.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index d66120fa66..ddeecad7dc 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -154,7 +154,7 @@ static inline av_const int av_log2_16bit(unsigned int v) /* median of 3 */ static inline av_const int mid_pred(int a, int b, int c) { -#ifdef HAVE_CMOV +#if HAVE_CMOV int i=b; __asm__ volatile( "cmp %2, %1 \n\t" @@ -323,9 +323,9 @@ static inline av_pure int ff_get_fourcc(const char *s){ }\ } -#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_BFIN) +#if ARCH_X86 || ARCH_PPC || ARCH_BFIN #define AV_READ_TIME read_time -#if defined(ARCH_X86) +#if ARCH_X86 static inline uint64_t read_time(void) { uint32_t a, d; @@ -366,7 +366,7 @@ static inline uint64_t read_time(void) return (((uint64_t)tbu)<<32) | (uint64_t)tbl; } #endif -#elif defined(HAVE_GETHRTIME) +#elif HAVE_GETHRTIME #define AV_READ_TIME gethrtime #endif @@ -397,11 +397,11 @@ tend= AV_READ_TIME();\ #endif /** - * Returns NULL if CONFIG_SMALL is defined otherwise the argument + * Returns NULL if CONFIG_SMALL is true otherwise the argument * without modifications, used to disable the definition of strings * (for example AVCodec long_names). */ -#ifdef CONFIG_SMALL +#if CONFIG_SMALL # define NULL_IF_CONFIG_SMALL(x) NULL #else # define NULL_IF_CONFIG_SMALL(x) x |