[MPlayer-users] [PATCH] OS/X demux_mov conflicts resolved

[Steven M. Schultz]

Hi!

	For OS/X the native Quicktime -framework is being used - thus
	the loader/qtx/qtxsdk files should _not_ be used, they conflict
	very badly and prevent compilation.

	Attached is a trivially small patch that uses moves the
	non-OS/X case inside a '#else' in the MACOSX #ifdef.

	Cheers,
	Steven Schultz
-------------- next part --------------
--- libmpdemux/demux_mov.c.dist	Tue Nov  4 09:07:39 2003
+++ libmpdemux/demux_mov.c	Wed Nov  5 17:04:24 2003
@@ -32,10 +32,10 @@
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
-#include "../loader/qtx/qtxsdk/components.h"
-
 #ifdef MACOSX
 #include <QuickTime/QuickTime.h>
+#else
+#include "../loader/qtx/qtxsdk/components.h"
 #endif
 
 #ifdef HAVE_ZLIB