diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-30 21:58:43 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-30 21:58:43 +0000 |
| commit | 75af07495adce80b64e8240b6d6efc61ea14265b (patch) | |
| tree | c1486d78f997d3c09470e350fe08b0fa8d0e6bce /libavutil/common.h | |
| parent | 1e1a0b1845fb0be4efea91066cec2a5af7f28352 (diff) | |
| download | ffmpeg-75af07495adce80b64e8240b6d6efc61ea14265b.tar.gz | |
Revert addition of '#undef av_always_inline' to config.h in the small case.
Instead, #include config.h at the top of common.h so that av_always_inline
does not get doubly defined.
Originally committed as revision 19553 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/common.h')
| -rw-r--r-- | libavutil/common.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 5f47572770..47666ab20a 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -35,6 +35,10 @@ #include <stdlib.h> #include <string.h> +#ifdef HAVE_AV_CONFIG_H +#include "config.h" +#endif + #ifdef __GNUC__ # define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y) #else @@ -280,7 +284,6 @@ static inline av_const float av_clipf(float a, float amin, float amax) #include "mem.h" #ifdef HAVE_AV_CONFIG_H -# include "config.h" # include "internal.h" #endif /* HAVE_AV_CONFIG_H */ |