summaryrefslogtreecommitdiffstats
path: root/libavutil/common.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-01-02 10:25:12 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-01-02 10:25:12 +0100
commit4cf66a81932a1f3775b8952ebe010be067990674 (patch)
tree2665e8ac28958bebbb5bca1c42a8bd9904ab3c46 /libavutil/common.h
parent40231a58a0d8bffbe2264fe980483edaa6fc422e (diff)
parent50078c1c8070dd8d1c329e8117ff30ec72489039 (diff)
downloadffmpeg-streaming-4cf66a81932a1f3775b8952ebe010be067990674.zip
ffmpeg-streaming-4cf66a81932a1f3775b8952ebe010be067990674.tar.gz
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/common.h')
-rw-r--r--libavutil/common.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/common.h b/libavutil/common.h
index 6f0f582..ea63643 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 */
OpenPOWER on IntegriCloud