From bc204370aeb7b1062ef89f2eef8fae46287c0ed6 Mon Sep 17 00:00:00 2001 From: Erich Hoover Date: Sun, 11 Sep 2011 14:10:19 -0600 Subject: [PATCH] quartz: Do not assert when IAsyncReader::WaitForNext returns VFW_E_TIMEOUT. --- dlls/quartz/pin.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index af26a6bbf30..4c6a84d0c75 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -478,14 +478,15 @@ static void PullPin_Thread_Process(PullPin *This) } else { - /* FIXME: This is not well handled yet! */ - ERR("Processing error: %x\n", hr); if (hr == VFW_E_TIMEOUT) { - assert(!pSample); + if (pSample != NULL) + WARN("Non-NULL sample returned with VFW_E_TIMEOUT.\n"); hr = S_OK; - continue; } + /* FIXME: Errors are not well handled yet! */ + else + ERR("Processing error: %x\n", hr); } if (pSample)