[Mplayer-cvslog] CVS: main/loader/dshow DS_AudioDecoder.c,1.12,1.13 DS_VideoDecoder.c,1.24,1.25 allocator.c,1.8,1.9

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/loader/dshow
In directory mail:/var/tmp.root/cvs-serv23417

Modified Files:
	DS_AudioDecoder.c DS_VideoDecoder.c allocator.c 
Log Message:
cbAlign=1 fix for proper Windows support (noticed by Sascha Sommer)

Index: DS_AudioDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/DS_AudioDecoder.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DS_AudioDecoder.c	14 Dec 2002 17:56:35 -0000	1.12
+++ DS_AudioDecoder.c	25 Feb 2003 16:16:37 -0000	1.13
@@ -105,7 +105,8 @@
 
 	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);
     }

Index: DS_VideoDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/DS_VideoDecoder.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DS_VideoDecoder.c	14 Dec 2002 17:56:35 -0000	1.24
+++ DS_VideoDecoder.c	25 Feb 2003 16:16:37 -0000	1.25
@@ -277,9 +277,8 @@
     
     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);
     

Index: allocator.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dshow/allocator.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- allocator.c	26 Nov 2002 21:00:20 -0000	1.8
+++ allocator.c	25 Feb 2003 16:16:37 -0000	1.9
@@ -306,7 +306,8 @@
     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));