Browse Source

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.
tags/n3.0
Janne Grunau 10 years ago
parent
commit
50078c1c80
5 changed files with 7 additions and 2 deletions
  1. +1
    -1
      libavutil/common.h
  2. +1
    -0
      libavutil/internal.h
  3. +2
    -0
      libavutil/lls.c
  4. +1
    -1
      libavutil/lls.h
  5. +2
    -0
      libavutil/macros.h

+ 1
- 1
libavutil/common.h View File

@@ -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 */



+ 1
- 0
libavutil/internal.h View File

@@ -37,6 +37,7 @@
#include "config.h"
#include "attributes.h"
#include "dict.h"
#include "macros.h"
#include "pixfmt.h"

#if ARCH_X86


+ 2
- 0
libavutil/lls.c View File

@@ -29,6 +29,8 @@
#include <string.h>

#include "attributes.h"
#include "config.h"
#include "internal.h"
#include "version.h"
#include "lls.h"



+ 1
- 1
libavutil/lls.h View File

@@ -23,7 +23,7 @@
#ifndef AVUTIL_LLS_H
#define AVUTIL_LLS_H

#include "common.h"
#include "macros.h"
#include "mem.h"
#include "version.h"



+ 2
- 0
libavutil/macros.h View File

@@ -45,4 +45,6 @@

#define AV_PRAGMA(s) _Pragma(#s)

#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))

#endif /* AVUTIL_MACROS_H */

Loading…
Cancel
Save