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 #ifdef HAVE_AV_CONFIG_H sections

Browse Source 
Originally committed as revision 7254 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-12-07 20:06:11 +00:00
parent a77caa4dc9
commit 1845bf1fdf
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavutil/common.h
View File

@ -26,6 +26,8 @@
#ifndef COMMON_H #ifndef COMMON_H
#define COMMON_H #define COMMON_H
#include <inttypes.h>
#ifdef HAVE_AV_CONFIG_H #ifdef HAVE_AV_CONFIG_H
/* only include the following when compiling package */ /* only include the following when compiling package */
# include "config.h" # include "config.h"
@ -41,6 +43,7 @@
# include "berrno.h" # include "berrno.h"
# endif # endif
# include <math.h> # include <math.h>
# include "internal.h"
#endif /* HAVE_AV_CONFIG_H */ #endif /* HAVE_AV_CONFIG_H */
#ifndef attribute_deprecated #ifndef attribute_deprecated
@ -51,18 +54,11 @@
#endif #endif
#endif #endif
# include <inttypes.h>
#ifndef INT64_C #ifndef INT64_C
#define INT64_C(c) (c ## LL) #define INT64_C(c) (c ## LL)
#define UINT64_C(c) (c ## ULL) #define UINT64_C(c) (c ## ULL)
#endif #endif
#ifdef HAVE_AV_CONFIG_H
/* only include the following when compiling package */
# include "internal.h"
#endif
//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 */