Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:25:12 +0000 (10:25 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sat, 2 Jan 2016 09:25:12 +0000 (10:25 +0100)
* commit '50078c1c8070dd8d1c329e8117ff30ec72489039':
  libavutil: move FFALIGN macro from common.h to macros.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavutil/common.h
libavutil/internal.h
libavutil/lls.c
libavutil/lls.h
libavutil/macros.h

Simple merge
  #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
Simple merge