From: Rémi Bernon rbernon@codeweavers.com
--- dlls/mp3dmod/mp3dmod.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 383ad9818b8..6f96d07231d 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -185,12 +185,9 @@ static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, if (type_index) return DMO_E_NO_MORE_ITEMS;
+ memset(type, 0, sizeof(*type)); type->majortype = WMMEDIATYPE_Audio; type->subtype = WMMEDIASUBTYPE_MP3; - type->formattype = GUID_NULL; - type->pUnk = NULL; - type->cbFormat = 0; - type->pbFormat = NULL;
return S_OK; } @@ -214,10 +211,10 @@ static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index if (type_index >= (2 * input_format->nChannels)) return DMO_E_NO_MORE_ITEMS;
+ memset(type, 0, sizeof(*type)); type->majortype = WMMEDIATYPE_Audio; type->subtype = WMMEDIASUBTYPE_PCM; type->formattype = WMFORMAT_WaveFormatEx; - type->pUnk = NULL; type->cbFormat = sizeof(WAVEFORMATEX); if (!(type->pbFormat = CoTaskMemAlloc(sizeof(WAVEFORMATEX)))) return E_OUTOFMEMORY; @@ -228,7 +225,6 @@ static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index format->wBitsPerSample = (type_index % 2) ? 8 : 16; format->nBlockAlign = format->nChannels * format->wBitsPerSample / 8; format->nAvgBytesPerSec = format->nSamplesPerSec * format->nBlockAlign; - format->cbSize = 0;
return S_OK; }