mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
libavutil: move FFALIGN macro from common.h to macros.h
Include macros.h explicitly in common.h so that external code using FFALIGN does not break. It was already implicitly included through version.h. Include macros.h in lls.h and internal.h for FFALIGN. lls.h was including common.h only for FFALIGN and internal.h was missing the include for FFALIGN. `make checkheaders` did not catch it because it's an internal header.
This commit is contained in:
parent
dbce017913
commit
50078c1c80
@ -36,6 +36,7 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "attributes.h"
|
||||
#include "macros.h"
|
||||
#include "version.h"
|
||||
#include "libavutil/avconfig.h"
|
||||
|
||||
@ -59,7 +60,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 */
|
||||
|
||||
|
@ -37,6 +37,7 @@
|
||||
#include "config.h"
|
||||
#include "attributes.h"
|
||||
#include "dict.h"
|
||||
#include "macros.h"
|
||||
#include "pixfmt.h"
|
||||
|
||||
#if ARCH_X86
|
||||
|
@ -29,6 +29,8 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "attributes.h"
|
||||
#include "config.h"
|
||||
#include "internal.h"
|
||||
#include "version.h"
|
||||
#include "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"
|
||||
|
||||
|
@ -45,4 +45,6 @@
|
||||
|
||||
#define AV_PRAGMA(s) _Pragma(#s)
|
||||
|
||||
#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
|
||||
|
||||
#endif /* AVUTIL_MACROS_H */
|
||||
|
Loading…
Reference in New Issue
Block a user