Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
23428:c45f009ce3a7 23429:450bb2a75cba
10 #include "registry.h" 10 #include "registry.h"
11 #ifdef WIN32_LOADER 11 #ifdef WIN32_LOADER
12 #include "../ldt_keeper.h" 12 #include "../ldt_keeper.h"
13 #endif 13 #endif
14 14
15 #ifndef NOAVIFILE_HEADERS
16 #include "videodecoder.h"
17 #else
18 #include "dshow/libwin32.h" 15 #include "dshow/libwin32.h"
19 #endif
20 #include "DMO_Filter.h" 16 #include "DMO_Filter.h"
21 17
22 #include "DMO_VideoDecoder.h" 18 #include "DMO_VideoDecoder.h"
23 19
24 struct _DMO_VideoDecoder 20 struct _DMO_VideoDecoder
36 }; 32 };
37 33
38 //#include "DMO_VideoDecoder.h" 34 //#include "DMO_VideoDecoder.h"
39 35
40 #include "../wine/winerror.h" 36 #include "../wine/winerror.h"
41
42 #ifndef NOAVIFILE_HEADERS
43 #define VFW_E_NOT_RUNNING 0x80040226
44 #include "fourcc.h"
45 #include "except.h"
46 #endif
47 37
48 #include <unistd.h> 38 #include <unistd.h>
49 #include <fcntl.h> 39 #include <fcntl.h>
50 #include <errno.h> 40 #include <errno.h>
51 #include <sys/types.h> 41 #include <sys/types.h>