Commit 2b1d6c00 authored by Laurent Aimar's avatar Laurent Aimar
Browse files

Fixed input_GetEsObjects().

parent f1941624
...@@ -631,9 +631,9 @@ void input_DecoderGetObjects( decoder_t *p_dec, ...@@ -631,9 +631,9 @@ void input_DecoderGetObjects( decoder_t *p_dec,
vlc_mutex_lock( &p_owner->lock ); vlc_mutex_lock( &p_owner->lock );
if( pp_vout ) if( pp_vout )
*pp_vout = vlc_object_hold( p_owner->p_vout ); *pp_vout = p_owner->p_vout ? vlc_object_hold( p_owner->p_vout ) : NULL;
if( pp_aout ) if( pp_aout )
*pp_aout = vlc_object_hold( p_owner->p_aout ); *pp_aout = p_owner->p_aout ? vlc_object_hold( p_owner->p_aout ) : NULL;
vlc_mutex_unlock( &p_owner->lock ); vlc_mutex_unlock( &p_owner->lock );
} }
......
...@@ -2470,14 +2470,16 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args ) ...@@ -2470,14 +2470,16 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
vlc_object_t **pp_decoder = va_arg( args, vlc_object_t ** ); vlc_object_t **pp_decoder = va_arg( args, vlc_object_t ** );
vout_thread_t **pp_vout = va_arg( args, vout_thread_t ** ); vout_thread_t **pp_vout = va_arg( args, vout_thread_t ** );
aout_instance_t **pp_aout = va_arg( args, aout_instance_t ** ); aout_instance_t **pp_aout = va_arg( args, aout_instance_t ** );
if( es->p_dec ) if( p_es->p_dec )
{ {
if( pp_decoder ) if( pp_decoder )
*pp_decoder = vlc_object_hold( es->p_dec ); *pp_decoder = vlc_object_hold( p_es->p_dec );
input_DecoderGetObjects( es->p_dec, pp_vout, pp_aout ); input_DecoderGetObjects( p_es->p_dec, pp_vout, pp_aout );
} }
else else
{ {
if( pp_decoder )
*pp_decoder = NULL;
if( pp_vout ) if( pp_vout )
*pp_vout = NULL; *pp_vout = NULL;
if( pp_aout ) if( pp_aout )
......
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