Revision a955b596

View differences:

libavutil/common.h
90 90
#   include "intmath.h"
91 91
#endif
92 92

  
93
#ifndef av_log2
94
#   define av_log2       av_log2_c
95
#endif
96
#ifndef av_log2_16bit
97
#   define av_log2_16bit av_log2_16bit_c
98
#endif
93
/* Pull in unguarded fallback defines at the end of this file. */
94
#include "common.h"
99 95

  
100 96
/**
101 97
 * Clip a signed integer value into the amin-amax range.
......
312 308
#endif /* HAVE_AV_CONFIG_H */
313 309

  
314 310
#endif /* AVUTIL_COMMON_H */
311

  
312
/*
313
 * The following definitions are outside the multiple inclusion guard
314
 * to ensure they are immediately available in intmath.h.
315
 */
316

  
317
#ifndef av_log2
318
#   define av_log2       av_log2_c
319
#endif
320
#ifndef av_log2_16bit
321
#   define av_log2_16bit av_log2_16bit_c
322
#endif
libavutil/intmath.h
52 52
#   endif
53 53
#endif /* FASTDIV */
54 54

  
55
/*
56
 * Get definition of av_log2_c from common.h.  In the event we got
57
 * here through common.h including this file, including it again will
58
 * be a no-op due to multi-inclusion guards, so we must duplicate the
59
 * fallback defines here.
60
 */
61

  
62 55
#include "common.h"
63 56

  
64
#ifndef av_log2
65
#   define av_log2       av_log2_c
66
#endif
67
#ifndef av_log2_16bit
68
#   define av_log2_16bit av_log2_16bit_c
69
#endif
70

  
71 57
extern const uint8_t ff_sqrt_tab[256];
72 58

  
73 59
static inline av_const unsigned int ff_sqrt(unsigned int a)

Also available in: Unified diff