diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-12-07 20:06:11 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-12-07 20:06:11 +0000 |
| commit | 1845bf1fdfe71b80237b71f9dd7b6043cf61be70 (patch) | |
| tree | ecb27ed031648e4d9a3e7abfc420f41baaa8916a | |
| parent | a77caa4dc92d1865a823574a09de789ad553423b (diff) | |
| download | ffmpeg-1845bf1fdfe71b80237b71f9dd7b6043cf61be70.tar.gz | |
merge #ifdef HAVE_AV_CONFIG_H sections
Originally committed as revision 7254 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/common.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 77b1c3f1fa..d8baf12379 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -26,6 +26,8 @@ #ifndef COMMON_H #define COMMON_H +#include <inttypes.h> + #ifdef HAVE_AV_CONFIG_H /* only include the following when compiling package */ # include "config.h" @@ -41,6 +43,7 @@ # include "berrno.h" # endif # include <math.h> +# include "internal.h" #endif /* HAVE_AV_CONFIG_H */ #ifndef attribute_deprecated @@ -51,18 +54,11 @@ #endif #endif -# include <inttypes.h> - #ifndef INT64_C #define INT64_C(c) (c ## LL) #define UINT64_C(c) (c ## ULL) #endif -#ifdef HAVE_AV_CONFIG_H -/* only include the following when compiling package */ -# include "internal.h" -#endif - //rounded divison & shift #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) /* assume b>0 */ |