Changeset 5ba84a43aab674f0946af0a1c06190677a6a8c73

Show
Ignore:
Timestamp:
27/04/04 03:04:53 (5 years ago)
Author:
Rocky Bernstein <rocky@videolan.org>
git-committer:
Rocky Bernstein <rocky@videolan.org> 1083027893 +0000
git-parent:

[6a231625dd3a2d45d4ff7a87e5c6a3f23ff756d2]

git-author:
Rocky Bernstein <rocky@videolan.org> 1083027893 +0000
Message:

ogt.c: add object_release for object_find
cvd.c: if spu-channel variable not set, don't bother handling subtitle.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/codec/ogt/cvd.c

    rb878118 r5ba84a4  
    246246    if( !p_input ) return NULL; 
    247247 
    248         var_Get( p_input, "spu-channel", &val ); 
     248    if( var_Get( p_input, "spu-channel", &val ) ) { 
     249      vlc_object_release( p_input ); 
     250      return NULL; 
     251    } 
     252     
    249253        vlc_object_release( p_input ); 
    250254 

  • modules/codec/ogt/ogt.c

    r6607097 r5ba84a4  
    245245           p_block->i_buffer); 
    246246 
    247 #if 0 
    248     if( config_GetInt( p_dec, "spu-channel" ) != p_buffer[1] ) 
    249       return NULL; 
    250 #else 
    251247    /* Attach to our input thread and see if subtitle is selected. */ 
    252248    { 
    …… 
    258254    if( !p_input ) return NULL; 
    259255 
    260         if( var_Get( p_input, "spu-channel", &val ) ) return NULL; 
     256        if( var_Get( p_input, "spu-channel", &val ) ) { 
     257      vlc_object_release( p_input ); 
     258          return NULL; 
     259        } 
    261260     
     261        vlc_object_release( p_input ); 
    262262        dbg_print( (DECODE_DBG_PACKET),  
    263263                   "val.i_int %x p_buffer[i] %x", val.i_int, p_buffer[1]); 
    …… 
    270270        } 
    271271    } 
    272 #endif 
    273272 
    274273    if ( p_sys->state == SUBTITLE_BLOCK_EMPTY ) {