Unified · Split
| @@ -42,6 +42,13 @@ · 41 unmodified lines | ||
| 42 | 42 | #include "attributes.h" |
| 43 | 43 | #include "error.h" |
| 44 | 44 | #include "macros.h" |
| 45 | +#include "mem.h" | |
| 46 | + | |
| 47 | +#ifdef HAVE_AV_CONFIG_H | |
| 48 | +# include "config.h" | |
| 49 | +# include "intmath.h" | |
| 50 | +# include "internal.h" | |
| 51 | +#endif /* HAVE_AV_CONFIG_H */ | |
| 45 | 52 | |
| 46 | 53 | //rounded division & shift |
| 47 | 54 | #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) |
| @@ -84,11 +91,6 @@ · 36 unmodified lines | ||
| 84 | 91 | |
| 85 | 92 | /* misc math functions */ |
| 86 | 93 | |
| 87 | −#ifdef HAVE_AV_CONFIG_H | |
| 88 | −# include "config.h" | |
| 89 | −# include "intmath.h" | |
| 90 | −#endif | |
| 91 | − | |
| 92 | 94 | #ifndef av_ceil_log2 |
| 93 | 95 | # define av_ceil_log2 av_ceil_log2_c |
| 94 | 96 | #endif |
| @@ -568,12 +570,4 @@ static av_always_inline av_const int av_parity_c(uint32_t v) · 473 unmodified lines | ||
| 568 | 570 | }\ |
| 569 | 571 | }\ |
| 570 | 572 | |
| 571 | − | |
| 572 | − | |
| 573 | −#include "mem.h" | |
| 574 | − | |
| 575 | −#ifdef HAVE_AV_CONFIG_H | |
| 576 | −# include "internal.h" | |
| 577 | −#endif /* HAVE_AV_CONFIG_H */ | |
| 578 | − | |
| 579 | 573 | #endif /* AVUTIL_COMMON_H */ |