From cf332d16c2e0266e56445ea963eeeef24a38b5b4 Mon Sep 17 00:00:00 2001
From: nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 28 Nov 2006 23:13:08 +0000
Subject: [PATCH] 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
---
 libaf/af_format.c      |  8 ++++----
 libmpdemux/demux_mov.c | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 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 */
 
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 6eb2a8ab6e..df6e8c7d00 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -22,6 +22,14 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifdef MACOSX
+#include <QuickTime/QuickTime.h>
+#include <QuickTime/ImageCompression.h>
+#include <QuickTime/ImageCodec.h>
+#else
+#include "loader/qtx/qtxsdk/components.h"
+#endif
+
 #include "config.h"
 #include "mp_msg.h"
 #include "help_mp.h"
@@ -38,14 +46,6 @@ extern subtitle *vo_sub;
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
-#ifdef MACOSX
-#include <QuickTime/QuickTime.h>
-#include <QuickTime/ImageCompression.h>
-#include <QuickTime/ImageCodec.h>
-#else
-#include "loader/qtx/qtxsdk/components.h"
-#endif
-
 #ifdef HAVE_ZLIB
 #include <zlib.h>
 #endif