Changeset fe22119f649296e0cdf03051c41fb749bc14cc40

Show
Ignore:
Timestamp:
21/03/08 22:25:49 (7 months ago)
Author:
Sam Hocevar <sam@zoy.org>
git-committer:
Sam Hocevar <sam@zoy.org> 1206134749 +0000
git-parent:

[bcff0f227b560798e710f8ec27dd57632e9e82eb]

git-author:
Sam Hocevar <sam@zoy.org> 1206134277 +0000
Message:

Add missing p_vout->pf_end in vmem.c and snapshot.c

The p_vout->pf_end method is mandatory for video output modules. It is
called from so many places in libvlc that it would be too tedious to
make it optional. I'm therefore adding empty methods to modules instead.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_output/snapshot.c

    r99fab90 rfe22119  
    5656 
    5757static int  Init      ( vout_thread_t * ); 
     58static void End       ( vout_thread_t * ); 
    5859static void Display   ( vout_thread_t *, picture_t * ); 
    5960 
    …… 
    124125 
    125126    p_vout->pf_init = Init; 
    126     p_vout->pf_end = NULL; 
     127    p_vout->pf_end = End; 
    127128    p_vout->pf_manage = NULL; 
    128129    p_vout->pf_render = NULL; 
    …… 
    319320 
    320321/***************************************************************************** 
     322 * End: terminate video thread output method 
     323 *****************************************************************************/ 
     324static void End( vout_thread_t *p_vout ) 
     325{ 
     326    (void)p_vout; 
     327} 
     328 
     329/***************************************************************************** 
    321330 * Destroy: destroy video thread 
    322331 ***************************************************************************** 

  • modules/video_output/vmem.c

    rc4b95b5 rfe22119  
    4040 
    4141static int  Init          ( vout_thread_t * ); 
     42static void End           ( vout_thread_t * ); 
    4243static int  LockPicture   ( vout_thread_t *, picture_t * ); 
    4344static int  UnlockPicture ( vout_thread_t *, picture_t * ); 
    …… 
    116117 
    117118    p_vout->pf_init = Init; 
    118     p_vout->pf_end = NULL; 
     119    p_vout->pf_end = End; 
    119120    p_vout->pf_manage = NULL; 
    120121    p_vout->pf_render = NULL; 
    …… 
    251252 
    252253/***************************************************************************** 
     254 * End: terminate video thread output method 
     255 *****************************************************************************/ 
     256static void End( vout_thread_t *p_vout ) 
     257{ 
     258    (void)p_vout; 
     259} 
     260 
     261/***************************************************************************** 
    253262 * Destroy: destroy video thread 
    254263 *****************************************************************************