virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'

Browse Source 
* commit '50078c1c8070dd8d1c329e8117ff30ec72489039':
  libavutil: move FFALIGN macro from common.h to macros.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-01-02 10:25:12 +01:00
commit 4cf66a8193
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/common.h
View File

@ -40,6 +40,7 @@
#include <string.h> #include <string.h>
#include "attributes.h" #include "attributes.h"
#include "macros.h"
#include "version.h" #include "version.h"
#include "libavutil/avconfig.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 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 FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
/* misc math functions */ /* misc math functions */

1
libavutil/internal.h
View File

@ -39,6 +39,7 @@
#include "timer.h" #include "timer.h"
#include "cpu.h" #include "cpu.h"
#include "dict.h" #include "dict.h"
#include "macros.h"
#include "pixfmt.h" #include "pixfmt.h"
#include "version.h" #include "version.h"

2
libavutil/lls.c
View File

@ -29,6 +29,8 @@
#include <string.h> #include <string.h>
#include "attributes.h" #include "attributes.h"
#include "config.h"
#include "internal.h"
#include "version.h" #include "version.h"
#include "lls.h" #include "lls.h"

2
libavutil/lls.h
View File

@ -23,7 +23,7 @@
#ifndef AVUTIL_LLS_H #ifndef AVUTIL_LLS_H
#define AVUTIL_LLS_H #define AVUTIL_LLS_H
#include "common.h" #include "macros.h"
#include "mem.h" #include "mem.h"
#include "version.h" #include "version.h"

2
libavutil/macros.h
View File

@ -45,4 +45,6 @@
#define AV_PRAGMA(s) _Pragma(#s) #define AV_PRAGMA(s) _Pragma(#s)
#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
#endif /* AVUTIL_MACROS_H */ #endif /* AVUTIL_MACROS_H */