avutil/common: Move includes to the beginning of the file

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2024-02-17 21:27:35 +01:00 committed by Paul B Mahol
parent 71803f437e
commit 2613ac13bf

View File

@ -42,6 +42,13 @@
#include "attributes.h" #include "attributes.h"
#include "error.h" #include "error.h"
#include "macros.h" #include "macros.h"
#include "mem.h"
#ifdef HAVE_AV_CONFIG_H
# include "config.h"
# include "intmath.h"
# include "internal.h"
#endif /* HAVE_AV_CONFIG_H */
//rounded division & shift //rounded division & shift
#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
@ -84,11 +91,6 @@
/* misc math functions */ /* misc math functions */
#ifdef HAVE_AV_CONFIG_H
# include "config.h"
# include "intmath.h"
#endif
#ifndef av_ceil_log2 #ifndef av_ceil_log2
# define av_ceil_log2 av_ceil_log2_c # define av_ceil_log2 av_ceil_log2_c
#endif #endif
@ -568,12 +570,4 @@ static av_always_inline av_const int av_parity_c(uint32_t v)
}\ }\
}\ }\
#include "mem.h"
#ifdef HAVE_AV_CONFIG_H
# include "internal.h"
#endif /* HAVE_AV_CONFIG_H */
#endif /* AVUTIL_COMMON_H */ #endif /* AVUTIL_COMMON_H */