Mercurial > mplayer.hg

diff loader/dmo/DMO_VideoDecoder.c @ 23429:450bb2a75cba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of superfluous NOAVIFILE_HEADERS #define, it was always enabled and cluttered the code. Blessed by Reimar.
author diego
date Sat, 02 Jun 2007 12:26:27 +0000
parents b99edbf76db4
children dfc8e126ac86
line wrap: on
line diff
--- 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>