Module: wine Branch: master Commit: c925e3abc83cf924eba98c11e537ed93fd0bdeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c925e3abc83cf924eba98c11e5...
Author: Chris Robinson chris.kcat@gmail.com Date: Mon Mar 10 01:50:57 2008 -0700
quartz: Don't print errors for handled return values.
---
dlls/quartz/acmwrapper.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index b4e3274..de90b81 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -137,7 +137,8 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte unprepare_header = TRUE;
if ((res = acmStreamConvert(This->has, &ash, This->reinit_codec ? ACM_STREAMCONVERTF_START : 0))) { - ERR("Cannot convert data header %d\n", res); + if(res != MMSYSERR_MOREDATA) + ERR("Cannot convert data header %d\n", res); goto error; } This->reinit_codec = FALSE; @@ -154,10 +155,11 @@ static HRESULT ACMWrapper_ProcessSampleData(TransformFilterImpl* pTransformFilte else This->current_size = 0;
- hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); - if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { - ERR("Error sending sample (%x)\n", hr); - goto error; + hr = OutputPin_SendSample((OutputPin*)This->tf.ppPins[1], pOutSample); + if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { + if (FAILED(hr)) + ERR("Error sending sample (%x)\n", hr); + goto error; }
error: