[FFmpeg-cvslog] avutil/common: Move includes to the beginning of the file
Andreas Rheinhardt
git at videolan.org
Wed Feb 21 02:45:00 EET 2024
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Feb 17 21:27:35 2024 +0100| [b6b33f7edd949a013ee137afa6c6b5e340ad34cc] | committer: Andreas Rheinhardt
avutil/common: Move includes to the beginning of the file
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6b33f7edd949a013ee137afa6c6b5e340ad34cc
---
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 */
More information about the ffmpeg-cvslog
mailing list