Commit 6021d023 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

VOUT_CLOSE is unsafe and pointless. Do not use it.

If an interface exits "early" it should reparent (although reparenting
is no safer). Otherwise, the core will ensure that the video output was
safely closed before it terminates the interface.
parent 53195e9f
......@@ -254,8 +254,7 @@ static void Run( intf_thread_t *p_intf )
if( p_vout )
{
if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS )
vout_Control( p_vout, VOUT_REPARENT, 0 );
vout_Control( p_vout, VOUT_REPARENT, 0 );
vlc_object_release( p_vout );
}
......
......@@ -203,8 +203,7 @@ void VlcProc::registerVoutWindow( void *pVoutWindow )
// Reparent the vout window
if( m_pVout )
{
if( vout_Control( m_pVout, VOUT_REPARENT, 0 ) != VLC_SUCCESS )
vout_Control( m_pVout, VOUT_CLOSE );
vout_Control( m_pVout, VOUT_REPARENT, 0 );
}
}
......@@ -219,8 +218,7 @@ void VlcProc::dropVout()
{
if( m_pVout )
{
if( vout_Control( m_pVout, VOUT_REPARENT, 0 ) != VLC_SUCCESS )
vout_Control( m_pVout, VOUT_CLOSE );
vout_Control( m_pVout, VOUT_REPARENT, 0 );
m_pVout = NULL;
}
}
......
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