Mercurial > mplayer.hg
changeset 21353:a965ca17debc
reordering of #include to avoid clash with math.h and quicktime/*.h, patch by Crhis Roccati<roccati@pobox.com>
| author | nplourde |
|---|---|
| date | Tue, 28 Nov 2006 23:13:08 +0000 |
| parents | 2d786b7625d7 |
| children | 072d3248d309 |
| files | libaf/af_format.c libmpdemux/demux_mov.c |
| diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libaf/af_format.c Tue Nov 28 23:05:45 2006 +0000 +++ b/libaf/af_format.c Tue Nov 28 23:13:08 2006 +0000 @@ -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 */
--- a/libmpdemux/demux_mov.c Tue Nov 28 23:05:45 2006 +0000 +++ b/libmpdemux/demux_mov.c Tue Nov 28 23:13:08 2006 +0000 @@ -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