| Message ID | GV1SPRMB00638F299487942CD68B2CD88F522@GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | b6b33f7edd949a013ee137afa6c6b5e340ad34cc |
| Headers | show |
| Series | [FFmpeg-devel] avutil/common: Move includes to the beginning of the file | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavutil/common.h | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/libavutil/common.h b/libavutil/common.h > index de2140a678..57c87f1919 100644 > --- a/libavutil/common.h > +++ b/libavutil/common.h > @@ -42,6 +42,13 @@ > #include "attributes.h" > #include "error.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 > #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) > @@ -84,11 +91,6 @@ > > /* misc math functions */ > > -#ifdef HAVE_AV_CONFIG_H > -# include "config.h" > -# include "intmath.h" > -#endif > - > #ifndef av_ceil_log2 > # define av_ceil_log2 av_ceil_log2_c > #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 */ Will apply this patch tomorrow unless there are objections. - Andreas
diff --git a/libavutil/common.h b/libavutil/common.h index de2140a678..57c87f1919 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -42,6 +42,13 @@ #include "attributes.h" #include "error.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 #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) @@ -84,11 +91,6 @@ /* misc math functions */ -#ifdef HAVE_AV_CONFIG_H -# include "config.h" -# include "intmath.h" -#endif - #ifndef av_ceil_log2 # define av_ceil_log2 av_ceil_log2_c #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 */
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavutil/common.h | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)