# HG changeset patch
# User mru
# Date 1165521971 0
# Node ID aa83c1df5a691fa49fd9d59aa189a9d69b84ab90
# Parent  d96dae9bdcaa5cab31f1b363f6ee1f3ddf62a3d4
merge #ifdef HAVE_AV_CONFIG_H sections

diff -r d96dae9bdcaa -r aa83c1df5a69 common.h
--- a/common.h	Thu Dec 07 19:27:00 2006 +0000
+++ b/common.h	Thu Dec 07 20:06:11 2006 +0000
@@ -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 */