Merge commit '50078c1c'

* commit '50078c1c':
  libavutil: move FFALIGN macro from common.h to macros.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

libavutil/common.h

@@ -40,6 +40,7 @@
 #include <string.h>
 
 #include "attributes.h"
+#include "macros.h"
 #include "version.h"
 #include "libavutil/avconfig.h"
 
@@ -94,7 +95,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 */
 

libavutil/internal.h

@@ -39,6 +39,7 @@
 #include "timer.h"
 #include "cpu.h"
 #include "dict.h"
+#include "macros.h"
 #include "pixfmt.h"
 #include "version.h"
 

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"
 

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"
 

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 */