summaryrefslogtreecommitdiffstats
path: root/loader/dshow/DS_VideoDecoder.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-06-02 12:26:27 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-06-02 12:26:27 +0000
commit4f88dffa130591daa88a30a30e02406b8566a49a (patch)
tree796f2bb71999ce03c6897e08f858c26f14cf137b /loader/dshow/DS_VideoDecoder.c
parent09ea65448e40133bdd6d86e15bcea163dd40d6b2 (diff)
downloadmpv-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/DS_VideoDecoder.c')
-rw-r--r--loader/dshow/DS_VideoDecoder.c11
1 files changed, 0 insertions, 11 deletions
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>