From a955b5965825631986ba854d007d4e934e466c7d Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Wed, 7 Jul 2010 17:27:43 +0000 Subject: Remove macro duplication between common.h and intmath.h Originally committed as revision 24086 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/intmath.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'libavutil/intmath.h') diff --git a/libavutil/intmath.h b/libavutil/intmath.h index 7ba3afb913..8b400ef054 100644 --- a/libavutil/intmath.h +++ b/libavutil/intmath.h @@ -52,22 +52,8 @@ extern const uint32_t ff_inverse[257]; # endif #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" -#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]; static inline av_const unsigned int ff_sqrt(unsigned int a) -- cgit v1.2.3