diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-02 12:26:27 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-02 12:26:27 +0000 |
| commit | 4f88dffa130591daa88a30a30e02406b8566a49a (patch) | |
| tree | 796f2bb71999ce03c6897e08f858c26f14cf137b /loader/dmo | |
| parent | 09ea65448e40133bdd6d86e15bcea163dd40d6b2 (diff) | |
| download | mpv-4f88dffa130591daa88a30a30e02406b8566a49a.tar.bz2 mpv-4f88dffa130591daa88a30a30e02406b8566a49a.tar.xz | |
Get rid of superfluous NOAVIFILE_HEADERS #define, it was always enabled and
cluttered the code. Blessed by Reimar.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23447 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dmo')
| -rw-r--r-- | loader/dmo/DMO_AudioDecoder.c | 5 | ||||
| -rw-r--r-- | loader/dmo/DMO_VideoDecoder.c | 10 |
2 files changed, 0 insertions, 15 deletions
diff --git a/loader/dmo/DMO_AudioDecoder.c b/loader/dmo/DMO_AudioDecoder.c index 661883beab..83a90659ba 100644 --- a/loader/dmo/DMO_AudioDecoder.c +++ b/loader/dmo/DMO_AudioDecoder.c @@ -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 --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c index 27f11e89af..6771bc126d 100644 --- a/loader/dmo/DMO_VideoDecoder.c +++ b/loader/dmo/DMO_VideoDecoder.c @@ -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> |