Commit 1845bf1f authored by Måns Rullgård's avatar Måns Rullgård
Browse files

merge #ifdef HAVE_AV_CONFIG_H sections

Originally committed as revision 7254 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a77caa4d
......@@ -26,6 +26,8 @@
#ifndef COMMON_H
#define COMMON_H
#include <inttypes.h>
#ifdef HAVE_AV_CONFIG_H
/* only include the following when compiling package */
# include "config.h"
......@@ -41,6 +43,7 @@
# include "berrno.h"
# endif
# include <math.h>
# include "internal.h"
#endif /* HAVE_AV_CONFIG_H */
#ifndef attribute_deprecated
......@@ -51,18 +54,11 @@
#endif
#endif
# include <inttypes.h>
#ifndef INT64_C
#define INT64_C(c) (c ## LL)
#define UINT64_C(c) (c ## ULL)
#endif
#ifdef HAVE_AV_CONFIG_H
/* only include the following when compiling package */
# include "internal.h"
#endif
//rounded divison & shift
#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
/* assume b>0 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment