# HG changeset patch # User mru # Date 1268156359 0 # Node ID 4d9ad0ed07d05c075dc14248e721e8a85d7412dc # Parent 9d32a031ab0b514cba1e3f4613b6c7c9f357a72a Replace many includes of libavutil/common.h with what is actually needed This reduces the number of false dependencies on header files and speeds up compilation. diff -r 9d32a031ab0b -r 4d9ad0ed07d0 adler32.c --- a/adler32.c Tue Mar 09 16:17:59 2010 +0000 +++ b/adler32.c Tue Mar 09 17:39:19 2010 +0000 @@ -21,7 +21,7 @@ * 3. This notice may not be removed or altered from any source distribution. */ -#include "common.h" +#include "config.h" #include "adler32.h" #define BASE 65521L /* largest prime smaller than 65536 */ @@ -53,6 +53,7 @@ #ifdef TEST #include "log.h" +#include "timer.h" #define LEN 7001 volatile int checksum; int main(void){ diff -r 9d32a031ab0b -r 4d9ad0ed07d0 adler32.h --- a/adler32.h Tue Mar 09 16:17:59 2010 +0000 +++ b/adler32.h Tue Mar 09 17:39:19 2010 +0000 @@ -22,7 +22,7 @@ #define AVUTIL_ADLER32_H #include -#include "common.h" +#include "attributes.h" unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len) av_pure; diff -r 9d32a031ab0b -r 4d9ad0ed07d0 arm/bswap.h --- a/arm/bswap.h Tue Mar 09 16:17:59 2010 +0000 +++ b/arm/bswap.h Tue Mar 09 17:39:19 2010 +0000 @@ -21,7 +21,7 @@ #include #include "config.h" -#include "libavutil/common.h" +#include "libavutil/attributes.h" #ifdef __ARMCC_VERSION diff -r 9d32a031ab0b -r 4d9ad0ed07d0 arm/intmath.h --- a/arm/intmath.h Tue Mar 09 16:17:59 2010 +0000 +++ b/arm/intmath.h Tue Mar 09 17:39:19 2010 +0000 @@ -22,7 +22,7 @@ #define AVUTIL_ARM_INTMATH_H #include "config.h" -#include "libavutil/common.h" +#include "libavutil/attributes.h" #if HAVE_INLINE_ASM diff -r 9d32a031ab0b -r 4d9ad0ed07d0 avr32/bswap.h --- a/avr32/bswap.h Tue Mar 09 16:17:59 2010 +0000 +++ b/avr32/bswap.h Tue Mar 09 17:39:19 2010 +0000 @@ -21,7 +21,7 @@ #include #include "config.h" -#include "libavutil/common.h" +#include "libavutil/attributes.h" #if HAVE_INLINE_ASM diff -r 9d32a031ab0b -r 4d9ad0ed07d0 bfin/bswap.h --- a/bfin/bswap.h Tue Mar 09 16:17:59 2010 +0000 +++ b/bfin/bswap.h Tue Mar 09 17:39:19 2010 +0000 @@ -28,7 +28,7 @@ #include #include "config.h" -#include "libavutil/common.h" +#include "libavutil/attributes.h" #define bswap_32 bswap_32 static av_always_inline av_const uint32_t bswap_32(uint32_t x) diff -r 9d32a031ab0b -r 4d9ad0ed07d0 bswap.h --- a/bswap.h Tue Mar 09 16:17:59 2010 +0000 +++ b/bswap.h Tue Mar 09 17:39:19 2010 +0000 @@ -28,7 +28,7 @@ #include #include "config.h" -#include "common.h" +#include "attributes.h" #if ARCH_ARM # include "arm/bswap.h" diff -r 9d32a031ab0b -r 4d9ad0ed07d0 crc.c --- a/crc.c Tue Mar 09 16:17:59 2010 +0000 +++ b/crc.c Tue Mar 09 17:39:19 2010 +0000 @@ -19,6 +19,7 @@ */ #include "config.h" +#include "common.h" #include "bswap.h" #include "crc.h" diff -r 9d32a031ab0b -r 4d9ad0ed07d0 crc.h --- a/crc.h Tue Mar 09 16:17:59 2010 +0000 +++ b/crc.h Tue Mar 09 17:39:19 2010 +0000 @@ -23,7 +23,7 @@ #include #include -#include "common.h" +#include "attributes.h" typedef uint32_t AVCRC; diff -r 9d32a031ab0b -r 4d9ad0ed07d0 fifo.h --- a/fifo.h Tue Mar 09 16:17:59 2010 +0000 +++ b/fifo.h Tue Mar 09 17:39:19 2010 +0000 @@ -25,8 +25,6 @@ #define AVUTIL_FIFO_H #include -#include "avutil.h" -#include "common.h" typedef struct AVFifoBuffer { uint8_t *buffer; diff -r 9d32a031ab0b -r 4d9ad0ed07d0 internal.h --- a/internal.h Tue Mar 09 16:17:59 2010 +0000 +++ b/internal.h Tue Mar 09 17:39:19 2010 +0000 @@ -35,8 +35,7 @@ #include #include #include "config.h" -#include "common.h" -#include "mem.h" +#include "attributes.h" #include "timer.h" #ifndef attribute_align_arg diff -r 9d32a031ab0b -r 4d9ad0ed07d0 intfloat_readwrite.c --- a/intfloat_readwrite.c Tue Mar 09 16:17:59 2010 +0000 +++ b/intfloat_readwrite.c Tue Mar 09 17:39:19 2010 +0000 @@ -25,7 +25,8 @@ * portable IEEE float/double read/write functions */ -#include "common.h" +#include +#include #include "intfloat_readwrite.h" double av_int2dbl(int64_t v){ diff -r 9d32a031ab0b -r 4d9ad0ed07d0 intfloat_readwrite.h --- a/intfloat_readwrite.h Tue Mar 09 16:17:59 2010 +0000 +++ b/intfloat_readwrite.h Tue Mar 09 17:39:19 2010 +0000 @@ -22,7 +22,7 @@ #define AVUTIL_INTFLOAT_READWRITE_H #include -#include "common.h" +#include "attributes.h" /* IEEE 80 bits extended float */ typedef struct AVExtFloat { diff -r 9d32a031ab0b -r 4d9ad0ed07d0 lfg.c --- a/lfg.c Tue Mar 09 16:17:59 2010 +0000 +++ b/lfg.c Tue Mar 09 17:39:19 2010 +0000 @@ -23,6 +23,7 @@ #include "lfg.h" #include "md5.h" #include "intreadwrite.h" +#include "attributes.h" void av_cold av_lfg_init(AVLFG *c, unsigned int seed){ uint8_t tmp[16]={0}; @@ -56,7 +57,7 @@ #ifdef TEST #include "log.h" -#include "common.h" +#include "timer.h" int main(void) { diff -r 9d32a031ab0b -r 4d9ad0ed07d0 mathematics.c --- a/mathematics.c Tue Mar 09 16:17:59 2010 +0000 +++ b/mathematics.c Tue Mar 09 17:39:19 2010 +0000 @@ -24,8 +24,8 @@ */ #include -#include "avutil.h" -#include "common.h" +#include +#include #include "mathematics.h" const uint8_t ff_sqrt_tab[256]={ diff -r 9d32a031ab0b -r 4d9ad0ed07d0 mathematics.h --- a/mathematics.h Tue Mar 09 16:17:59 2010 +0000 +++ b/mathematics.h Tue Mar 09 17:39:19 2010 +0000 @@ -23,7 +23,7 @@ #include #include -#include "common.h" +#include "attributes.h" #include "rational.h" #ifndef M_E diff -r 9d32a031ab0b -r 4d9ad0ed07d0 md5.c --- a/md5.c Tue Mar 09 16:17:59 2010 +0000 +++ b/md5.c Tue Mar 09 17:39:19 2010 +0000 @@ -163,6 +163,7 @@ #ifdef TEST #include +#include #undef printf int main(void){ uint64_t md5val; diff -r 9d32a031ab0b -r 4d9ad0ed07d0 mem.h --- a/mem.h Tue Mar 09 16:17:59 2010 +0000 +++ b/mem.h Tue Mar 09 17:39:19 2010 +0000 @@ -26,7 +26,7 @@ #ifndef AVUTIL_MEM_H #define AVUTIL_MEM_H -#include "common.h" +#include "attributes.h" #if defined(__ICC) || defined(__SUNPRO_C) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v diff -r 9d32a031ab0b -r 4d9ad0ed07d0 rational.h --- a/rational.h Tue Mar 09 16:17:59 2010 +0000 +++ b/rational.h Tue Mar 09 17:39:19 2010 +0000 @@ -29,7 +29,7 @@ #define AVUTIL_RATIONAL_H #include -#include "common.h" +#include "attributes.h" /** * rational number numerator/denominator diff -r 9d32a031ab0b -r 4d9ad0ed07d0 sh4/bswap.h --- a/sh4/bswap.h Tue Mar 09 16:17:59 2010 +0000 +++ b/sh4/bswap.h Tue Mar 09 17:39:19 2010 +0000 @@ -26,7 +26,7 @@ #include #include "config.h" -#include "libavutil/common.h" +#include "libavutil/attributes.h" #define bswap_16 bswap_16 static av_always_inline av_const uint16_t bswap_16(uint16_t x) diff -r 9d32a031ab0b -r 4d9ad0ed07d0 sha.c --- a/sha.c Tue Mar 09 16:17:59 2010 +0000 +++ b/sha.c Tue Mar 09 17:39:19 2010 +0000 @@ -21,8 +21,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "common.h" -#include "avutil.h" +#include #include "bswap.h" #include "sha.h" #include "sha1.h" diff -r 9d32a031ab0b -r 4d9ad0ed07d0 tree.c --- a/tree.c Tue Mar 09 16:17:59 2010 +0000 +++ b/tree.c Tue Mar 09 17:39:19 2010 +0000 @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "common.h" #include "log.h" #include "tree.h" diff -r 9d32a031ab0b -r 4d9ad0ed07d0 x86/bswap.h --- a/x86/bswap.h Tue Mar 09 16:17:59 2010 +0000 +++ b/x86/bswap.h Tue Mar 09 17:39:19 2010 +0000 @@ -26,7 +26,7 @@ #include #include "config.h" -#include "libavutil/common.h" +#include "libavutil/attributes.h" #define bswap_16 bswap_16 static av_always_inline av_const uint16_t bswap_16(uint16_t x) diff -r 9d32a031ab0b -r 4d9ad0ed07d0 x86/intmath.h --- a/x86/intmath.h Tue Mar 09 16:17:59 2010 +0000 +++ b/x86/intmath.h Tue Mar 09 17:39:19 2010 +0000 @@ -21,8 +21,6 @@ #ifndef AVUTIL_X86_INTMATH_H #define AVUTIL_X86_INTMATH_H -#include "libavutil/common.h" - #define FASTDIV(a,b) \ ({\ int ret, dmy;\ diff -r 9d32a031ab0b -r 4d9ad0ed07d0 x86/intreadwrite.h --- a/x86/intreadwrite.h Tue Mar 09 16:17:59 2010 +0000 +++ b/x86/intreadwrite.h Tue Mar 09 17:39:19 2010 +0000 @@ -23,7 +23,7 @@ #include #include "config.h" -#include "libavutil/common.h" +#include "libavutil/attributes.h" #if HAVE_MMX