diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
| commit | 36e7a20e695b376287310d602b44d6719f82a021 (patch) | |
| tree | 75070d702043e875c947fccaa2de7a419331de22 /loader/dshow/DS_Filter.h | |
| parent | 70fb003a9f2d9dc764e320f3ca64b0af1c68fdfb (diff) | |
| parent | 93abb4f09229730c30e5bbdd6c54d4b981995eee (diff) | |
| download | mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.bz2 mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.xz | |
Merge svn changes up to r30550
Diffstat (limited to 'loader/dshow/DS_Filter.h')
| -rw-r--r-- | loader/dshow/DS_Filter.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/loader/dshow/DS_Filter.h b/loader/dshow/DS_Filter.h index 8fda4b4ef2..945321a153 100644 --- a/loader/dshow/DS_Filter.h +++ b/loader/dshow/DS_Filter.h @@ -4,10 +4,6 @@ #include "inputpin.h" #include "outputpin.h" -#if defined(__cplusplus) -extern "C" { -#endif - typedef struct { char* frame_pointer; long frame_size; @@ -43,8 +39,4 @@ DS_Filter* DS_FilterCreate(const char* dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt,SampleProcUserData* pUserData); void DS_Filter_Destroy(DS_Filter* This); -#if defined(__cplusplus) -} -#endif - #endif /* MPLAYER_DS_FILTER_H */ |