Commit 5ba84a43 authored by Rocky Bernstein's avatar Rocky Bernstein

ogt.c: add object_release for object_find

cvd.c: if spu-channel variable not set, don't bother handling subtitle.
parent 6a231625
......@@ -245,7 +245,11 @@ Reassemble( decoder_t *p_dec, block_t **pp_block )
if( !p_input ) return NULL;
var_Get( p_input, "spu-channel", &val );
if( var_Get( p_input, "spu-channel", &val ) ) {
vlc_object_release( p_input );
return NULL;
}
vlc_object_release( p_input );
/* Number could be 0bd, 1bd, 2bd, 3bd for 0..3. If so
......
......@@ -244,10 +244,6 @@ Reassemble( decoder_t *p_dec, block_t **pp_block )
p_buffer[1], p_buffer[2], p_buffer[3], p_buffer[4],
p_block->i_buffer);
#if 0
if( config_GetInt( p_dec, "spu-channel" ) != p_buffer[1] )
return NULL;
#else
/* Attach to our input thread and see if subtitle is selected. */
{
vlc_object_t * p_input;
......@@ -257,8 +253,12 @@ Reassemble( decoder_t *p_dec, block_t **pp_block )
if( !p_input ) return NULL;
if( var_Get( p_input, "spu-channel", &val ) ) return NULL;
if( var_Get( p_input, "spu-channel", &val ) ) {
vlc_object_release( p_input );
return NULL;
}
vlc_object_release( p_input );
dbg_print( (DECODE_DBG_PACKET),
"val.i_int %x p_buffer[i] %x", val.i_int, p_buffer[1]);
......@@ -269,7 +269,6 @@ Reassemble( decoder_t *p_dec, block_t **pp_block )
return NULL;
}
}
#endif
if ( p_sys->state == SUBTITLE_BLOCK_EMPTY ) {
i_expected_image = p_sys->i_image+1;
......
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