diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 10:25:12 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 10:25:12 +0100 |
| commit | 4cf66a81932a1f3775b8952ebe010be067990674 (patch) | |
| tree | 2665e8ac28958bebbb5bca1c42a8bd9904ab3c46 /libavutil | |
| parent | 40231a58a0d8bffbe2264fe980483edaa6fc422e (diff) | |
| parent | 50078c1c8070dd8d1c329e8117ff30ec72489039 (diff) | |
Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'
* commit '50078c1c8070dd8d1c329e8117ff30ec72489039':
libavutil: move FFALIGN macro from common.h to macros.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil')
| -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 6f0f5827e0..ea636431c1 100644 --- a/libavutil/common.h +++ b/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 */ diff --git a/libavutil/internal.h b/libavutil/internal.h index 076aa47f3d..c4bcf37ab8 100644 --- a/libavutil/internal.h +++ b/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" diff --git a/libavutil/lls.c b/libavutil/lls.c index 4330697400..7dd718da86 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 5635b5b2fd..1a276d537d 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 446532377a..2007ee5619 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 */ |