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/dshow | |
| 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/dshow')
| -rw-r--r-- | loader/dshow/DS_AudioDecoder.c | 5 | ||||
| -rw-r--r-- | loader/dshow/DS_VideoDecoder.c | 11 | ||||
| -rw-r--r-- | loader/dshow/mediatype.c | 7 |
3 files changed, 0 insertions, 23 deletions
diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index 23cd65bdfc..be2ddce23e 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -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 --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index 4f5a8b7a79..99c6770a99 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -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> diff --git a/loader/dshow/mediatype.c b/loader/dshow/mediatype.c index 9288f3808f..9b8f2f10de 100644 --- a/loader/dshow/mediatype.c +++ b/loader/dshow/mediatype.c @@ -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; |