Stick to the file's coding convention.

[vlc] / modules / access / dshow / filter.h

diff --git a/modules/access/dshow/filter.h b/modules/access/dshow/filter.h
index 41236212db0c6b8554f8d6aaf06e4b28908058b2..ce7e6261db1dac6a9185f2f56bb0fc5682100342 100644 (file)
--- a/modules/access/dshow/filter.h
+++ b/modules/access/dshow/filter.h
@@ -34,11 +34,16 @@ using namespace std;
 #   include <unknwn.h>
 #   include <ole2.h>
 #   include <limits.h>
+#   ifdef _WINGDI_
+#      undef _WINGDI_
+#   endif
 #   define _WINGDI_ 1
 #   define AM_NOVTABLE
 #   define _OBJBASE_H_
 #   undef _X86_
-#   define _I64_MAX LONG_LONG_MAX
+#   ifndef _I64_MAX
+#     define _I64_MAX LONG_LONG_MAX
+#   endif
 #   define LONGLONG long long
 #endif
 
@@ -126,6 +131,8 @@ class CapturePin: public IPin, public IMemInputPin
 
     /* Custom methods */
     HRESULT CustomGetSample( VLCMediaSample * );
+    HRESULT CustomGetSamples( deque<VLCMediaSample> &external_queue );
+
     AM_MEDIA_TYPE &CustomGetMediaType();
 };