[vlc-devel] commit: Added input internal es_out_GetEsObjects to retreives decoder associated objects . (Laurent Aimar )

[Rafaël Carré]

On Sun, 31 Jan 2010 01:41:55 +0100 (CET)
git at videolan.org (git version control) wrote:

> +        case ES_OUT_GET_ES_OBJECTS_BY_ID:
> +        {
> +            const int i_id = va_arg( args, int );
> +            es_out_id_t *p_es = EsOutGetFromID( out, i_id );
> +            if( !p_es )
> +                return VLC_EGENERIC;
> +
> +            vlc_object_t    **pp_decoder = va_arg( args,
> vlc_object_t ** );
> +            vout_thread_t   **pp_vout    = va_arg( args,
> vout_thread_t ** );
> +            aout_instance_t **pp_aout    = va_arg( args,
> aout_instance_t ** );
> +            if( es->p_dec )
> +            {
> +                if( pp_decoder )
> +                    *pp_decoder = vlc_object_hold( es->p_dec );
> +                input_DecoderGetObjects( es->p_dec, pp_vout,
> pp_aout );
> +            }
> +            else
> +            {
> +                if( pp_vout )
> +                    *pp_vout = NULL;
> +                if( pp_aout )
> +                    *pp_aout = NULL;

pp_decoder should be set to NULL also, or skip those and return EGENERIC

> +            }
> +            return VLC_SUCCESS;
> +        }
> +


-- 
Rafaël Carré
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20100131/614bc935/attachment.sig>