[MPlayer-cvslog] r23447 - in trunk/loader: Makefile dmo/DMO_AudioDecoder.c dmo/DMO_VideoDecoder.c dshow/DS_AudioDecoder.c dshow/DS_VideoDecoder.c dshow/mediatype.c

[diego]

Author: diego
Date: Sat Jun  2 14:26:27 2007
New Revision: 23447

Log:
Get rid of superfluous NOAVIFILE_HEADERS #define, it was always enabled and
cluttered the code. Blessed by Reimar.


Modified:
   trunk/loader/Makefile
   trunk/loader/dmo/DMO_AudioDecoder.c
   trunk/loader/dmo/DMO_VideoDecoder.c
   trunk/loader/dshow/DS_AudioDecoder.c
   trunk/loader/dshow/DS_VideoDecoder.c
   trunk/loader/dshow/mediatype.c

Modified: trunk/loader/Makefile
==============================================================================
--- trunk/loader/Makefile	(original)
+++ trunk/loader/Makefile	Sat Jun  2 14:26:27 2007
@@ -2,7 +2,7 @@ include ../config.mak
 
 LIBNAME_COMMON = libloader.a
 
-CFLAGS= -D__WINE__ -DNOAVIFILE_HEADERS
+CFLAGS= -D__WINE__
 #CFLAGS+=-Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
 
 SRCS_COMMON  = driver.c afl.c vfl.c

Modified: trunk/loader/dmo/DMO_AudioDecoder.c
==============================================================================
--- trunk/loader/dmo/DMO_AudioDecoder.c	(original)
+++ trunk/loader/dmo/DMO_AudioDecoder.c	Sat Jun  2 14:26:27 2007
@@ -5,15 +5,10 @@
 
 *********************************************************/
 #include "config.h"
-#ifndef NOAVIFILE_HEADERS
-#include "audiodecoder.h"
-#include "except.h"
-#else
 #include "dshow/libwin32.h"
 #ifdef WIN32_LOADER
 #include "ldt_keeper.h"
 #endif
-#endif
 
 #include "DMO_Filter.h"
 #include "DMO_AudioDecoder.h"

Modified: trunk/loader/dmo/DMO_VideoDecoder.c
==============================================================================
--- trunk/loader/dmo/DMO_VideoDecoder.c	(original)
+++ trunk/loader/dmo/DMO_VideoDecoder.c	Sat Jun  2 14:26:27 2007
@@ -12,11 +12,7 @@
 #include "../ldt_keeper.h"
 #endif
 
-#ifndef NOAVIFILE_HEADERS
-#include "videodecoder.h"
-#else
 #include "dshow/libwin32.h"
-#endif
 #include "DMO_Filter.h"
 
 #include "DMO_VideoDecoder.h"
@@ -39,12 +35,6 @@ struct _DMO_VideoDecoder
 
 #include "../wine/winerror.h"
 
-#ifndef NOAVIFILE_HEADERS
-#define VFW_E_NOT_RUNNING               0x80040226
-#include "fourcc.h"
-#include "except.h"
-#endif
-
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>

Modified: trunk/loader/dshow/DS_AudioDecoder.c
==============================================================================
--- trunk/loader/dshow/DS_AudioDecoder.c	(original)
+++ trunk/loader/dshow/DS_AudioDecoder.c	Sat Jun  2 14:26:27 2007
@@ -6,12 +6,7 @@
 *********************************************************/
 #include "config.h"
 
-#ifndef NOAVIFILE_HEADERS
-#include "audiodecoder.h"
-#include "except.h"
-#else
 #include "libwin32.h"
-#endif
 
 #include "DS_Filter.h"
 

Modified: trunk/loader/dshow/DS_VideoDecoder.c
==============================================================================
--- trunk/loader/dshow/DS_VideoDecoder.c	(original)
+++ trunk/loader/dshow/DS_VideoDecoder.c	Sat Jun  2 14:26:27 2007
@@ -8,12 +8,7 @@
 #include "guids.h"
 #include "interfaces.h"
 #include "registry.h"
-
-#ifndef NOAVIFILE_HEADERS
-#include "videodecoder.h"
-#else
 #include "libwin32.h"
-#endif
 #include "DS_Filter.h"
 
 struct _DS_VideoDecoder
@@ -40,12 +35,6 @@ static SampleProcUserData sampleProcData
 #include "../ldt_keeper.h"
 #endif
 
-#ifndef NOAVIFILE_HEADERS
-#define VFW_E_NOT_RUNNING               0x80040226
-#include "fourcc.h"
-#include "except.h"
-#endif
-
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>

Modified: trunk/loader/dshow/mediatype.c
==============================================================================
--- trunk/loader/dshow/mediatype.c	(original)
+++ trunk/loader/dshow/mediatype.c	Sat Jun  2 14:26:27 2007
@@ -24,14 +24,7 @@
 #include "mp_msg.h"
 #include "wine/winerror.h"
 #include "com.h"
-
-
-#ifndef NOAVIFILE_HEADERS
-#include "audiodecoder.h"
-#include "except.h"
-#else
 #include "libwin32.h"
-#endif
 
 void DisplayMediaType(const char * label,const AM_MEDIA_TYPE* pmt){
     WAVEFORMATEX* pWF;