aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2012-09-07 08:16:30 -0400
committerMichael Niedermayer <michaelni@gmx.at>2012-09-07 22:23:32 +0200
commit80d2ec6bc905db9d85a11f9e7b8c1f097f18a8b1 (patch)
treeac803e247591a54837144713ab225518d09aba46
parentdbb9117d1817610ff1e7987a7c5a73b012d96b68 (diff)
downloadffmpeg-80d2ec6bc905db9d85a11f9e7b8c1f097f18a8b1.tar.gz
dshow: Change WINBOOL to BOOL
WINBOOL is MinGW-specific, and since both MSVC and MinGW have BOOL, use that instead. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavdevice/dshow_capture.h2
-rw-r--r--libavdevice/dshow_pin.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h
index a3f52318d6..e34f14fcc7 100644
--- a/libavdevice/dshow_capture.h
+++ b/libavdevice/dshow_capture.h
@@ -179,7 +179,7 @@ long WINAPI libAVMemInputPin_QueryInterface (libAVMemInputPin
unsigned long WINAPI libAVMemInputPin_AddRef (libAVMemInputPin *);
unsigned long WINAPI libAVMemInputPin_Release (libAVMemInputPin *);
long WINAPI libAVMemInputPin_GetAllocator (libAVMemInputPin *, IMemAllocator **);
-long WINAPI libAVMemInputPin_NotifyAllocator (libAVMemInputPin *, IMemAllocator *, WINBOOL);
+long WINAPI libAVMemInputPin_NotifyAllocator (libAVMemInputPin *, IMemAllocator *, BOOL);
long WINAPI libAVMemInputPin_GetAllocatorRequirements(libAVMemInputPin *, ALLOCATOR_PROPERTIES *);
long WINAPI libAVMemInputPin_Receive (libAVMemInputPin *, IMediaSample *);
long WINAPI libAVMemInputPin_ReceiveMultiple (libAVMemInputPin *, IMediaSample **, long, long *);
diff --git a/libavdevice/dshow_pin.c b/libavdevice/dshow_pin.c
index 3d9d4687c5..676877e903 100644
--- a/libavdevice/dshow_pin.c
+++ b/libavdevice/dshow_pin.c
@@ -286,7 +286,7 @@ libAVMemInputPin_GetAllocator(libAVMemInputPin *this, IMemAllocator **alloc)
}
long WINAPI
libAVMemInputPin_NotifyAllocator(libAVMemInputPin *this, IMemAllocator *alloc,
- WINBOOL rdwr)
+ BOOL rdwr)
{
dshowdebug("libAVMemInputPin_NotifyAllocator(%p)\n", this);
return S_OK;