virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Remove macro duplication between common.h and intmath.h

Browse Source 
Originally committed as revision 24086 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2010-07-07 17:27:43 +00:00
parent 2e874c7704
commit a955b59658
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavutil/common.h
View File

@ -90,12 +90,8 @@ static inline av_const int av_log2_16bit_c(unsigned int v)
# include "intmath.h" # include "intmath.h"
#endif #endif
#ifndef av_log2 /* Pull in unguarded fallback defines at the end of this file. */
# define av_log2 av_log2_c #include "common.h"
#endif
#ifndef av_log2_16bit
# define av_log2_16bit av_log2_16bit_c
#endif
/** /**
* Clip a signed integer value into the amin-amax range. * Clip a signed integer value into the amin-amax range.
@ -312,3 +308,15 @@ static inline av_const int av_ceil_log2(int x)
#endif /* HAVE_AV_CONFIG_H */ #endif /* HAVE_AV_CONFIG_H */
#endif /* AVUTIL_COMMON_H */ #endif /* AVUTIL_COMMON_H */
/*
* The following definitions are outside the multiple inclusion guard
* to ensure they are immediately available in intmath.h.
*/
#ifndef av_log2
# define av_log2 av_log2_c
#endif
#ifndef av_log2_16bit
# define av_log2_16bit av_log2_16bit_c
#endif

14
libavutil/intmath.h
View File

@ -52,22 +52,8 @@ extern const uint32_t ff_inverse[257];
# endif # endif
#endif /* FASTDIV */ #endif /* FASTDIV */
/*
* Get definition of av_log2_c from common.h. In the event we got
* here through common.h including this file, including it again will
* be a no-op due to multi-inclusion guards, so we must duplicate the
* fallback defines here.
*/
#include "common.h" #include "common.h"
#ifndef av_log2
# define av_log2 av_log2_c
#endif
#ifndef av_log2_16bit
# define av_log2_16bit av_log2_16bit_c
#endif
extern const uint8_t ff_sqrt_tab[256]; extern const uint8_t ff_sqrt_tab[256];
static inline av_const unsigned int ff_sqrt(unsigned int a) static inline av_const unsigned int ff_sqrt(unsigned int a)