summaryrefslogtreecommitdiffstats
path: root/loader/dshow/DS_VideoDecoder.h
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-22 03:16:31 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-11-22 03:16:31 +0000
commit4a7c3f22ec5c4ab2b96bf0d2dbee50af1b91dfa0 (patch)
tree348394fb7e9cad43295eeb04236ae02d5c8f2173 /loader/dshow/DS_VideoDecoder.h
parente5ebb2673d107e03823ca1c00512268d83760402 (diff)
downloadmpv-4a7c3f22ec5c4ab2b96bf0d2dbee50af1b91dfa0.tar.bz2
mpv-4a7c3f22ec5c4ab2b96bf0d2dbee50af1b91dfa0.tar.xz
mplayer integration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3064 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dshow/DS_VideoDecoder.h')
-rw-r--r--loader/dshow/DS_VideoDecoder.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h
index ba97162da4..4b2d19f90b 100644
--- a/loader/dshow/DS_VideoDecoder.h
+++ b/loader/dshow/DS_VideoDecoder.h
@@ -4,7 +4,7 @@
#ifndef NOAVIFILE_HEADERS
#include "videodecoder.h"
#else
-#include "../libwin32.h"
+#include "libwin32.h"
#endif
#include "DS_Filter.h"
@@ -36,7 +36,7 @@ void DS_VideoDecoder_StartInternal(DS_VideoDecoder *this);
void DS_VideoDecoder_StopInternal(DS_VideoDecoder *this);
-int DS_VideoDecoder_DecodeInternal(DS_VideoDecoder *this, const void* src, int size, int is_keyframe, CImage* pImage);
+int DS_VideoDecoder_DecodeInternal(DS_VideoDecoder *this, const void* src, int size, int is_keyframe, char* pImage);
/*
* bits == 0 - leave unchanged