Commit 4bcfe96c authored by Gildas Bazin's avatar Gildas Bazin

* src/video_output/video_output.c: we were still using free instead of
   vout_DestroySubPicture in one place.
* modules/codec/spudec/parse.c: we now make sure we don't add several times
   the same highlight callback.
parent 1cd3cacb
......@@ -2,7 +2,7 @@
* parse.c: SPU parser
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: parse.c,v 1.9 2003/01/17 13:54:11 sam Exp $
* $Id: parse.c,v 1.10 2003/01/30 19:14:17 gbazin Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
......@@ -166,6 +166,8 @@ void E_(ParsePacket)( spudec_thread_t *p_spudec )
vlc_mutex_lock( p_mutex );
UpdateSPU( p_spu, VLC_OBJECT(p_spu->p_sys->p_input) );
var_DelCallback( p_spu->p_sys->p_input,
"highlight", CropCallback, p_spu );
var_AddCallback( p_spu->p_sys->p_input,
"highlight", CropCallback, p_spu );
vlc_mutex_unlock( p_mutex );
......
......@@ -5,7 +5,7 @@
* thread, and destroy a previously oppened video output thread.
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: video_output.c,v 1.210 2003/01/28 22:03:21 sam Exp $
* $Id: video_output.c,v 1.211 2003/01/30 19:14:17 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
*
......@@ -930,7 +930,8 @@ static void EndThread( vout_thread_t *p_vout )
{
if( p_vout->p_subpicture[i_index].i_status != FREE_SUBPICTURE )
{
free( p_vout->p_subpicture[i_index].p_sys );
vout_DestroySubPicture( p_vout,
&p_vout->p_subpicture[i_index] );
}
}
......
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