summaryrefslogtreecommitdiffstats
path: root/libaf
diff options
context:
space:
mode:
authornplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-28 23:13:08 +0000
committernplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-11-28 23:13:08 +0000
commitcf332d16c2e0266e56445ea963eeeef24a38b5b4 (patch)
treee6b6018357e52dd438bb4d2c566119a43bcec213 /libaf
parent3058b1f8acdcfa2cdfa2f7744c6dd2b44228ce2f (diff)
downloadmpv-cf332d16c2e0266e56445ea963eeeef24a38b5b4.tar.bz2
mpv-cf332d16c2e0266e56445ea963eeeef24a38b5b4.tar.xz
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21369 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf')
-rw-r--r--libaf/af_format.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libaf/af_format.c b/libaf/af_format.c
index e5b7cc900e..486758b08c 100644
--- a/libaf/af_format.c
+++ b/libaf/af_format.c
@@ -13,10 +13,6 @@
#include <inttypes.h>
#include <limits.h>
-#include "af.h"
-#include "bswap.h"
-#include "libvo/fastmemcpy.h"
-
// Integer to float conversion through lrintf()
#ifdef HAVE_LRINTF
#include <math.h>
@@ -25,6 +21,10 @@ long int lrintf(float);
#define lrintf(x) ((int)(x))
#endif
+#include "af.h"
+#include "bswap.h"
+#include "libvo/fastmemcpy.h"
+
/* Functions used by play to convert the input audio to the correct
format */