Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'

* commit '50078c1c8070dd8d1c329e8117ff30ec72489039':
  libavutil: move FFALIGN macro from common.h to macros.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavutil/common.h
Simple merge

diff --cc libavutil/internal.h
index 076aa47,b9be333..c4bcf37
--- 1/libavutil/internal.h
--- 2/libavutil/internal.h
+++ b/libavutil/internal.h
@@@ -36,11 -36,9 +36,12 @@@
  #include <assert.h>
  #include "config.h"
  #include "attributes.h"
 +#include "timer.h"
 +#include "cpu.h"
  #include "dict.h"
+ #include "macros.h"
  #include "pixfmt.h"
 +#include "version.h"
  
  #if ARCH_X86
  #   include "x86/emms.h"

diff --cc libavutil/lls.c
Simple merge

diff --cc libavutil/lls.h
Simple merge

diff --cc libavutil/macros.h
Simple merge