From ff725d8f795ca9b9ee7166c11d109871f580c21e Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Mon, 17 Feb 2003 03:18:02 +0000 Subject: - fix LDT clash with linuxthreads - comment useless calls. some people really don't know what this thing does, they probably think that lots of Setup_FS_Segment() all over will make win32 gods happy. :) - fix vfw (indeo) and quicktime segfaults in short: xine now plays indeo, animatrix and the hulk trailers. CVS patchset: 4178 CVS date: 2003/02/17 03:18:02 --- src/libw32dll/dmo/DMO_AudioDecoder.c | 2 +- src/libw32dll/dmo/DMO_VideoDecoder.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/libw32dll/dmo') diff --git a/src/libw32dll/dmo/DMO_AudioDecoder.c b/src/libw32dll/dmo/DMO_AudioDecoder.c index 6df84c38e..faf49e266 100644 --- a/src/libw32dll/dmo/DMO_AudioDecoder.c +++ b/src/libw32dll/dmo/DMO_AudioDecoder.c @@ -129,7 +129,7 @@ int DMO_AudioDecoder_Convert(DMO_AudioDecoder *this, const void* in_data, unsign #ifdef LDT_paranoia Setup_FS_Segment(); #endif - + //m_pDMO_Filter->m_pMedia->vt->Lock(m_pDMO_Filter->m_pMedia, 1); bufferin = CMediaBufferCreate(in_size, (void*)in_data, in_size, 1); r = this->m_pDMO_Filter->m_pMedia->vt->ProcessInput(this->m_pDMO_Filter->m_pMedia, 0, diff --git a/src/libw32dll/dmo/DMO_VideoDecoder.c b/src/libw32dll/dmo/DMO_VideoDecoder.c index d32653edd..aba62ee63 100644 --- a/src/libw32dll/dmo/DMO_VideoDecoder.c +++ b/src/libw32dll/dmo/DMO_VideoDecoder.c @@ -320,7 +320,9 @@ int DMO_VideoDecoder_DecodeInternal(DMO_VideoDecoder *this, const void* src, int // return -1; // } +#ifdef LDT_paranoia Setup_FS_Segment(); +#endif bufferin = CMediaBufferCreate(size, (void*)src, size, 0); result = this->m_pDMO_Filter->m_pMedia->vt->ProcessInput(this->m_pDMO_Filter->m_pMedia, 0, @@ -507,7 +509,9 @@ int DMO_VideoDecoder_SetDestFmt(DMO_VideoDecoder *this, int bits, unsigned int c break; } +#ifdef LDT_paranoia Setup_FS_Segment(); +#endif // if(should_test) // result = this->m_pDMO_Filter->m_pOutputPin->vt->QueryAccept(this->m_pDMO_Filter->m_pOutputPin, &this->m_sDestType); -- cgit v1.2.3