Changeset bb03e12e367a4e3a5e8127fd5ebc1a7eb670c4f0

Show
Ignore:
Timestamp:
10/06/08 16:31:30 (4 months ago)
Author:
Antoine Cellerier <dionoea@videolan.org>
git-committer:
Antoine Cellerier <dionoea@videolan.org> 1213108290 +0200
git-parent:

[a7588a7ed7877c3b46b193ea07b2fccf70d6e2c1]

git-author:
Antoine Cellerier <dionoea@videolan.org> 1213108290 +0200
Message:

Partially fix sub picture filter chain handling. Still needs a bit of
work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/misc/filter_chain.c

    r39eef2d rbb03e12  
    9696        filter_chain_DeleteFilter( p_chain, 
    9797                                   (filter_t*)p_chain->filters.pp_elems[0] ); 
    98     es_format_Clean( &p_chain->fmt_in ); 
    99     es_format_Clean( &p_chain->fmt_out ); 
    100     es_format_Copy( &p_chain->fmt_in, p_fmt_in ); 
    101     es_format_Copy( &p_chain->fmt_out, p_fmt_out ); 
     98    if( p_fmt_in ) 
     99    { 
     100        es_format_Clean( &p_chain->fmt_in ); 
     101        es_format_Copy( &p_chain->fmt_in, p_fmt_in ); 
     102    } 
     103    if( p_fmt_out ) 
     104    { 
     105        es_format_Clean( &p_chain->fmt_out ); 
     106        es_format_Copy( &p_chain->fmt_out, p_fmt_out ); 
     107    } 
    102108} 
    103109 

  • src/video_output/vout_subpictures.c

    re259db6 rbb03e12  
    5555 
    5656static int spu_ParseChain( spu_t * ); 
    57 static void spu_DeleteChain( spu_t * ); 
    5857static int SubFilterCallback( vlc_object_t *, char const *, 
    5958                              vlc_value_t, vlc_value_t, void * ); 
    …… 
    190189    } 
    191190 
    192     spu_DeleteChain( p_spu ); 
     191    filter_chain_Delete( p_spu->p_chain ); 
    193192 
    194193    vlc_mutex_destroy( &p_spu->subpicture_lock ); 
    195194    vlc_object_release( p_spu ); 
    196 } 
    197  
    198 static void spu_DeleteChain( spu_t *p_spu ) 
    199 { 
    200     filter_chain_Delete( p_spu->p_chain ); 
    201195} 
    202196 
    …… 
    13461340    spu_t *p_spu = (spu_t *)p_data; 
    13471341    vlc_mutex_lock( &p_spu->subpicture_lock ); 
    1348     spu_DeleteChain( p_spu ); 
     1342    filter_chain_Reset( p_spu->p_chain, NULL, NULL ); 
    13491343    spu_ParseChain( p_spu ); 
    13501344    vlc_mutex_unlock( &p_spu->subpicture_lock );