summaryrefslogtreecommitdiffstats
path: root/loader/dshow/DS_VideoDecoder.h
diff options
context:
space:
mode:
Diffstat (limited to 'loader/dshow/DS_VideoDecoder.h')
-rw-r--r--loader/dshow/DS_VideoDecoder.h35
1 files changed, 4 insertions, 31 deletions
diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h
index e205a8d2a1..82e76f66a9 100644
--- a/loader/dshow/DS_VideoDecoder.h
+++ b/loader/dshow/DS_VideoDecoder.h
@@ -1,30 +1,7 @@
#ifndef AVIFILE_DS_VIDEODECODER_H
#define AVIFILE_DS_VIDEODECODER_H
-#ifndef NOAVIFILE_HEADERS
-#include "videodecoder.h"
-#else
-#include "libwin32.h"
-#endif
-#include "DS_Filter.h"
-
-typedef struct _DS_VideoDecoder
-{
- IVideoDecoder iv;
-
- DS_Filter* m_pDS_Filter;
- AM_MEDIA_TYPE m_sOurType, m_sDestType;
- VIDEOINFOHEADER* m_sVhdr;
- VIDEOINFOHEADER* m_sVhdr2;
- int m_Caps;//CAPS m_Caps; // capabilities of DirectShow decoder
- int m_iLastQuality; // remember last quality as integer
- int m_iMinBuffers;
- int m_iMaxAuto;
- int m_bIsDivX; // for speed
- int m_bIsDivX4; // for speed
-}DS_VideoDecoder;
-
-
+typedef struct _DS_VideoDecoder DS_VideoDecoder;
int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this);
@@ -42,14 +19,10 @@ int DS_VideoDecoder_DecodeInternal(DS_VideoDecoder *this, const void* src, int s
* bits == 0 - leave unchanged
*/
//int SetDestFmt(DS_VideoDecoder * this, int bits = 24, fourcc_t csp = 0);
-int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, fourcc_t csp);
-
-
+int DS_VideoDecoder_SetDestFmt(DS_VideoDecoder *this, int bits, unsigned int csp);
int DS_VideoDecoder_SetDirection(DS_VideoDecoder *this, int d);
-
-HRESULT DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value);
-
-HRESULT DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value);
+int DS_VideoDecoder_GetValue(DS_VideoDecoder *this, const char* name, int* value);
+int DS_VideoDecoder_SetValue(DS_VideoDecoder *this, const char* name, int value);
#endif /* AVIFILE_DS_VIDEODECODER_H */