Commit 98529c0a authored by Gildas Bazin's avatar Gildas Bazin

* modules/access/dshow/filter.cpp: work-around a bug in w32api-2.5.

parent 1492c3f2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* filter.c : DirectShow access module for vlc * filter.c : DirectShow access module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: filter.cpp,v 1.12 2004/01/28 16:46:52 gbazin Exp $ * $Id: filter.cpp,v 1.13 2004/02/16 13:33:10 gbazin Exp $
* *
* Author: Gildas Bazin <gbazin@netcourrier.com> * Author: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -32,6 +32,11 @@ ...@@ -32,6 +32,11 @@
#include <vlc/input.h> #include <vlc/input.h>
#include <vlc/vout.h> #include <vlc/vout.h>
#ifndef _MSC_VER
/* Work-around a bug in w32api-2.5 */
# define QACONTAINERFLAGS QACONTAINERFLAGS_SOMETHINGELSE
#endif
#include "filter.h" #include "filter.h"
#define DEBUG_DSHOW 1 #define DEBUG_DSHOW 1
...@@ -294,10 +299,10 @@ STDMETHODIMP CapturePin::Disconnect() ...@@ -294,10 +299,10 @@ STDMETHODIMP CapturePin::Disconnect()
msg_Dbg( p_input, "CapturePin::Disconnect" ); msg_Dbg( p_input, "CapturePin::Disconnect" );
#endif #endif
#if 0 // FIXME: This does seem to create crashes sometimes
VLCMediaSample vlc_sample; VLCMediaSample vlc_sample;
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_input->p_access_data;
#if 0 // FIXME: This does seem to create crashes sometimes
vlc_mutex_lock( &p_sys->lock ); vlc_mutex_lock( &p_sys->lock );
while( samples_queue.size() ) while( samples_queue.size() )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment