Changeset ba6ca8303f7a96d4fbf247cadc64c7b9efd05263

Show
Ignore:
Timestamp:
04/24/08 19:15:42 (4 months ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1209057342 +0200
git-parent:

[b529170cd376b1c4bcd275abbf426bdc6054e2dd]

git-author:
Jean-Paul Saman <jpsaman@videolan.org> 1208874371 +0200
Message:

Remove silly out of memory message in an out of memory situation and fixed indentation on bool declarations.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/codec/libmpeg2.c

    r449fd28 rba6ca83  
    5454    mpeg2dec_t          *p_mpeg2dec; 
    5555    const mpeg2_info_t  *p_info; 
    56     bool          b_skip; 
     56    bool                b_skip; 
    5757 
    5858    /* 
    …… 
    6565    int              i_current_rate; 
    6666    picture_t *      p_picture_to_destroy; 
    67     bool       b_garbage_pic; 
    68     bool       b_after_sequence_header; /* is it the next frame after 
     67    bool             b_garbage_pic; 
     68    bool             b_after_sequence_header; /* is it the next frame after 
    6969                                               * the sequence header ?    */ 
    70     bool       b_slice_i;             /* intra-slice refresh stream */ 
    71     bool       b_second_field; 
    72  
    73     bool       b_preroll; 
     70    bool             b_slice_i;             /* intra-slice refresh stream */ 
     71    bool             b_second_field; 
     72 
     73    bool             b_preroll; 
    7474 
    7575    /* 
    …… 
    130130    if( ( p_dec->p_sys = p_sys = 
    131131          (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL ) 
    132     { 
    133         msg_Err( p_dec, "out of memory" ); 
    134         return VLC_EGENERIC; 
    135     } 
     132        return VLC_ENOMEM; 
    136133 
    137134    /* Initialize the thread properties */ 
    …… 
    326323 
    327324            mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); 
    328         mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); 
     325            mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); 
    329326 
    330327            /* This picture will never go through display_picture. */ 
    …… 
    526523                    break; 
    527524                mpeg2_set_buf( p_sys->p_mpeg2dec, buf, p_pic ); 
    528         mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); 
     525                mpeg2_stride( p_sys->p_mpeg2dec, p_pic->p[Y_PLANE].i_pitch ); 
    529526            } 
    530527            p_sys->p_picture_to_destroy = p_pic;