← Back to branch summary

~videolan/vlc/old-trunk

« back to all changes in this revision

Viewing changes to src/video_output/video_output.c

  • Committer: zorglub
  • Date: 2006-09-24 12:40:10 UTC
  • Revision ID: vcs-imports@canonical.com-20060924124010-9313cccc4d61dbc9
Rename vlc_input_item_* functions to input_Item* for consistency
Add input_ItemAddOptionNoDup (unused at the moment)
+ free warning fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/video_output/video_output.c
6
6
 * thread, and destroy a previously oppened video output thread.
7
7
 *****************************************************************************
8
8
 * Copyright (C) 2000-2004 the VideoLAN team
9
 
 * $Id: video_output.c 16667 2006-09-15 22:58:44Z zorglub $
 
9
 * $Id: video_output.c 16821 2006-09-24 12:40:10Z zorglub $
10
10
 *
11
11
 * Authors: Vincent Seguin <seguin@via.ecp.fr>
12
12
 *          Gildas Bazin <gbazin@videolan.org>
117
117
        /* Reattach video output to playlist before bailing out */
118
118
        if( p_vout )
119
119
        {
120
 
            vlc_object_t *p_playlist = pl_Yield( p_this );
 
120
            playlist_t  *p_playlist = pl_Yield( p_this );
121
121
            spu_Attach( p_vout->p_spu, p_this, VLC_FALSE );
122
122
            vlc_object_detach( p_vout );
123
123
            vlc_object_attach( p_vout, p_playlist );
479
479
void vout_Destroy( vout_thread_t *p_vout )
480
480
{
481
481
    vout_thread_t *p_another_vout;
482
 
    vlc_object_t *p_playlist = pl_Yield( p_vout );
 
482
    playlist_t *p_playlist = pl_Yield( p_vout );
483
483
 
484
484
    /* Request thread destruction */
485
485
    p_vout->b_die = VLC_TRUE;