[MPlayer-cvslog] r21369 - in trunk: libaf/af_format.c libmpdemux/demux_mov.c

[nplourde]

Author: nplourde
Date: Wed Nov 29 00:13:08 2006
New Revision: 21369

Modified:
   trunk/libaf/af_format.c
   trunk/libmpdemux/demux_mov.c

Log:
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati at pobox.com>

Modified: trunk/libaf/af_format.c
==============================================================================
--- trunk/libaf/af_format.c	(original)
+++ trunk/libaf/af_format.c	Wed Nov 29 00:13:08 2006
@@ -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 @@
 #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 */
 

Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c	(original)
+++ trunk/libmpdemux/demux_mov.c	Wed Nov 29 00:13:08 2006
@@ -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 @@
 #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