diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2015-12-10 21:49:30 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2015-12-14 16:16:55 +0100 |
| commit | 50078c1c8070dd8d1c329e8117ff30ec72489039 (patch) | |
| tree | 87b1e0efac9fba09e7915d60859bfd1973848244 | |
| parent | dbce017913ce04966021a2f72e4f8fae5b4b7190 (diff) | |
| download | ffmpeg-50078c1c8070dd8d1c329e8117ff30ec72489039.tar.gz | |
libavutil: move FFALIGN macro from common.h to macros.h
Include macros.h explicitly in common.h so that external code using
FFALIGN does not break. It was already implicitly included through
version.h. Include macros.h in lls.h and internal.h for FFALIGN.
lls.h was including common.h only for FFALIGN and internal.h was
missing the include for FFALIGN. `make checkheaders` did not catch it
because it's an internal header.
| -rw-r--r-- | libavutil/common.h | 2 | ||||
| -rw-r--r-- | libavutil/internal.h | 1 | ||||
| -rw-r--r-- | libavutil/lls.c | 2 | ||||
| -rw-r--r-- | libavutil/lls.h | 2 | ||||
| -rw-r--r-- | libavutil/macros.h | 2 |
5 files changed, 7 insertions, 2 deletions
diff --git a/libavutil/common.h b/libavutil/common.h index 56556e744d..7a43ccf10a 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -36,6 +36,7 @@ #include <string.h> #include "attributes.h" +#include "macros.h" #include "version.h" #include "libavutil/avconfig.h" @@ -59,7 +60,6 @@ #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0) #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0])) -#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) /* misc math functions */ diff --git a/libavutil/internal.h b/libavutil/internal.h index 4264c4e6d5..b9be333b47 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -37,6 +37,7 @@ #include "config.h" #include "attributes.h" #include "dict.h" +#include "macros.h" #include "pixfmt.h" #if ARCH_X86 diff --git a/libavutil/lls.c b/libavutil/lls.c index 12989466e6..60d2b646ba 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -29,6 +29,8 @@ #include <string.h> #include "attributes.h" +#include "config.h" +#include "internal.h" #include "version.h" #include "lls.h" diff --git a/libavutil/lls.h b/libavutil/lls.h index 9b2b3a4091..3977e97235 100644 --- a/libavutil/lls.h +++ b/libavutil/lls.h @@ -23,7 +23,7 @@ #ifndef AVUTIL_LLS_H #define AVUTIL_LLS_H -#include "common.h" +#include "macros.h" #include "mem.h" #include "version.h" diff --git a/libavutil/macros.h b/libavutil/macros.h index bf3eb9b9a4..3e7b00559f 100644 --- a/libavutil/macros.h +++ b/libavutil/macros.h @@ -45,4 +45,6 @@ #define AV_PRAGMA(s) _Pragma(#s) +#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1)) + #endif /* AVUTIL_MACROS_H */ |