From 8401d53158982d4a5df6fbe30a3f46a9cbe1fb6f Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 25 Feb 2003 16:17:23 +0000 Subject: cbAlign=1 fix for proper Windows support (noticed by Sascha Sommer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9504 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/dmo/DMO_VideoDecoder.c | 4 ++-- loader/dshow/DS_AudioDecoder.c | 3 ++- loader/dshow/DS_VideoDecoder.c | 5 ++--- loader/dshow/allocator.c | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'loader') diff --git a/loader/dmo/DMO_VideoDecoder.c b/loader/dmo/DMO_VideoDecoder.c index 34cb54b7c8..937c1af61a 100644 --- a/loader/dmo/DMO_VideoDecoder.c +++ b/loader/dmo/DMO_VideoDecoder.c @@ -280,8 +280,8 @@ void DMO_VideoDecoder_StartInternal(DMO_VideoDecoder *this) props.cBuffers = 1; props.cbBuffer = this->m_sDestType.lSampleSize; - //don't know how to do this correctly - props.cbAlign = props.cbPrefix = 0; + props.cbAlign = 1; + props.cbPrefix = 0; this->m_pDMO_Filter->m_pAll->vt->SetProperties(this->m_pDMO_Filter->m_pAll, &props, &props1); this->m_pDMO_Filter->m_pAll->vt->Commit(this->m_pDMO_Filter->m_pAll); #endif diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index d38dcdd52b..851854a9df 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -105,7 +105,8 @@ DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* props.cBuffers=1; props.cbBuffer=this->m_sOurType.lSampleSize; - props.cbAlign=props.cbPrefix=0; + props.cbAlign=1; + props.cbPrefix=0; this->m_pDS_Filter->m_pAll->vt->SetProperties(this->m_pDS_Filter->m_pAll, &props, &props1); this->m_pDS_Filter->m_pAll->vt->Commit(this->m_pDS_Filter->m_pAll); } diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index ef3b77f33d..0ef20269a9 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -277,9 +277,8 @@ void DS_VideoDecoder_StartInternal(DS_VideoDecoder *this) props.cBuffers = 1; props.cbBuffer = this->m_sDestType.lSampleSize; - - //don't know how to do this correctly - props.cbAlign = props.cbPrefix = 0; + props.cbAlign = 1; + props.cbPrefix = 0; this->m_pDS_Filter->m_pAll->vt->SetProperties(this->m_pDS_Filter->m_pAll, &props, &props1); this->m_pDS_Filter->m_pAll->vt->Commit(this->m_pDS_Filter->m_pAll); diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c index 7f39c66a2e..34d453727e 100644 --- a/loader/dshow/allocator.c +++ b/loader/dshow/allocator.c @@ -306,7 +306,8 @@ MemAllocator* MemAllocatorCreate() This->refcount = 1; This->props.cBuffers = 1; This->props.cbBuffer = 65536; /* :/ */ - This->props.cbAlign = This->props.cbPrefix = 0; + This->props.cbAlign = 1; + This->props.cbPrefix = 0; This->vt = (IMemAllocator_vt*) malloc(sizeof(IMemAllocator_vt)); -- cgit v1.2.3