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/macros.h | |
| 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/macros.h')
| -rw-r--r-- | libavutil/macros.h | 2 |
1 files changed, 2 insertions, 0 deletions
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 */ |