mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Reorganize header #includes: Unconditionally #include standard C headers,
group all local #includes together. Originally committed as revision 16796 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
1777168269
commit
8076c4731f
@ -26,20 +26,14 @@
|
|||||||
#ifndef AVUTIL_COMMON_H
|
#ifndef AVUTIL_COMMON_H
|
||||||
#define AVUTIL_COMMON_H
|
#define AVUTIL_COMMON_H
|
||||||
|
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <inttypes.h>
|
#include <inttypes.h>
|
||||||
|
#include <limits.h>
|
||||||
#ifdef HAVE_AV_CONFIG_H
|
#include <math.h>
|
||||||
/* only include the following when compiling package */
|
#include <stdio.h>
|
||||||
# include "config.h"
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
# include <stdlib.h>
|
|
||||||
# include <stdio.h>
|
|
||||||
# include <string.h>
|
|
||||||
# include <ctype.h>
|
|
||||||
# include <limits.h>
|
|
||||||
# include <errno.h>
|
|
||||||
# include <math.h>
|
|
||||||
#endif /* HAVE_AV_CONFIG_H */
|
|
||||||
|
|
||||||
#define AV_GCC_VERSION_AT_LEAST(x,y) (defined(__GNUC__) && (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y))
|
#define AV_GCC_VERSION_AT_LEAST(x,y) (defined(__GNUC__) && (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y))
|
||||||
|
|
||||||
@ -99,8 +93,6 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mem.h"
|
|
||||||
|
|
||||||
//rounded divison & shift
|
//rounded divison & shift
|
||||||
#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
|
#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
|
||||||
/* assume b>0 */
|
/* assume b>0 */
|
||||||
@ -264,7 +256,10 @@ static inline av_const float av_clipf(float a, float amin, float amax)
|
|||||||
}\
|
}\
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#include "mem.h"
|
||||||
|
|
||||||
#ifdef HAVE_AV_CONFIG_H
|
#ifdef HAVE_AV_CONFIG_H
|
||||||
|
# include "config.h"
|
||||||
# include "internal.h"
|
# include "internal.h"
|
||||||
#endif /* HAVE_AV_CONFIG_H */
|
#endif /* HAVE_AV_CONFIG_H */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user