# HG changeset patch
# User diego
# Date 1180787187 0
# Node ID 450bb2a75cba9adbdda9327f5cfd8a652f70e3e6
# Parent  c45f009ce3a7246b77f72df42a3105c17f4e823e
Get rid of superfluous NOAVIFILE_HEADERS #define, it was always enabled and
cluttered the code. Blessed by Reimar.

diff -r c45f009ce3a7 -r 450bb2a75cba loader/Makefile
--- a/loader/Makefile	Sat Jun 02 12:24:35 2007 +0000
+++ b/loader/Makefile	Sat Jun 02 12:26:27 2007 +0000
@@ -2,7 +2,7 @@
 
 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
diff -r c45f009ce3a7 -r 450bb2a75cba loader/dmo/DMO_AudioDecoder.c
--- a/loader/dmo/DMO_AudioDecoder.c	Sat Jun 02 12:24:35 2007 +0000
+++ b/loader/dmo/DMO_AudioDecoder.c	Sat Jun 02 12:26:27 2007 +0000
@@ -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"
diff -r c45f009ce3a7 -r 450bb2a75cba loader/dmo/DMO_VideoDecoder.c
--- a/loader/dmo/DMO_VideoDecoder.c	Sat Jun 02 12:24:35 2007 +0000
+++ b/loader/dmo/DMO_VideoDecoder.c	Sat Jun 02 12:26:27 2007 +0000
@@ -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 @@
 
 #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>
diff -r c45f009ce3a7 -r 450bb2a75cba loader/dshow/DS_AudioDecoder.c
--- a/loader/dshow/DS_AudioDecoder.c	Sat Jun 02 12:24:35 2007 +0000
+++ b/loader/dshow/DS_AudioDecoder.c	Sat Jun 02 12:26:27 2007 +0000
@@ -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"
 
diff -r c45f009ce3a7 -r 450bb2a75cba loader/dshow/DS_VideoDecoder.c
--- a/loader/dshow/DS_VideoDecoder.c	Sat Jun 02 12:24:35 2007 +0000
+++ b/loader/dshow/DS_VideoDecoder.c	Sat Jun 02 12:26:27 2007 +0000
@@ -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 @@
 #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>
diff -r c45f009ce3a7 -r 450bb2a75cba loader/dshow/mediatype.c
--- a/loader/dshow/mediatype.c	Sat Jun 02 12:24:35 2007 +0000
+++ b/loader/dshow/mediatype.c	Sat Jun 02 12:26:27 2007 +0000
@@ -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;