Mercurial > libavutil.hg

comparison common.h @ 978:009d2ce554b2 libavutil

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove macro duplication between common.h and intmath.h
author mru
date Wed, 07 Jul 2010 17:27:43 +0000
parents 64a8e85b50be
children a3c26f53e6fa
comparison
equal deleted inserted replaced
977:2cbad2391250 978:009d2ce554b2
88 #ifdef HAVE_AV_CONFIG_H 88 #ifdef HAVE_AV_CONFIG_H
89 # include "config.h" 89 # include "config.h"
90 # include "intmath.h" 90 # include "intmath.h"
91 #endif 91 #endif
92 92
93 #ifndef av_log2 93 /* Pull in unguarded fallback defines at the end of this file. */
94 # define av_log2 av_log2_c 94 #include "common.h"
95 #endif
96 #ifndef av_log2_16bit
97 # define av_log2_16bit av_log2_16bit_c
98 #endif
99 95
100 /** 96 /**
101 * Clip a signed integer value into the amin-amax range. 97 * Clip a signed integer value into the amin-amax range.
102 * @param a value to clip 98 * @param a value to clip
103 * @param amin minimum value of the clip range 99 * @param amin minimum value of the clip range
310 #ifdef HAVE_AV_CONFIG_H 306 #ifdef HAVE_AV_CONFIG_H
311 # include "internal.h" 307 # include "internal.h"
312 #endif /* HAVE_AV_CONFIG_H */ 308 #endif /* HAVE_AV_CONFIG_H */
313 309
314 #endif /* AVUTIL_COMMON_H */ 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