summaryrefslogtreecommitdiff
path: root/libavutil/common.h
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2015-12-10 21:49:30 +0100
committerJanne Grunau <janne-libav@jannau.net>2015-12-14 16:16:55 +0100
commit50078c1c8070dd8d1c329e8117ff30ec72489039 (patch)
tree87b1e0efac9fba09e7915d60859bfd1973848244 /libavutil/common.h
parentdbce017913ce04966021a2f72e4f8fae5b4b7190 (diff)
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.
Diffstat (limited to 'libavutil/common.h')
-rw-r--r--libavutil/common.h2
1 files changed, 1 insertions, 1 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 */