Changeset 14764a967d832ba9da4242196895710543b78790

Show
Ignore:
Timestamp:
18/01/08 11:12:02 (11 months ago)
Author:
Jean-Paul Saman <jpsaman@videolan.org>
git-committer:
Jean-Paul Saman <jpsaman@videolan.org> 1200651122 +0000
git-parent:

[ca42fbe0b485eac3a0990f1aba3b660253cdaf98]

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

Fix regression introduced in [24381]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/packetizer/h264.c

    rca42fbe r14764a9  
    248248 
    249249        /* Set the new extradata */ 
     250        p_dec->fmt_out.i_extra = p_sys->p_pps->i_buffer + p_sys->p_sps->i_buffer; 
    250251        p_dec->fmt_out.p_extra = (uint8_t*)malloc( p_dec->fmt_out.i_extra ); 
    251252        if( p_dec->fmt_out.p_extra ) 
    252253        { 
    253             p_dec->fmt_out.i_extra = p_sys->p_pps->i_buffer + p_sys->p_sps->i_buffer; 
    254254            memcpy( (uint8_t*)p_dec->fmt_out.p_extra, p_sys->p_sps->p_buffer, p_sys->p_sps->i_buffer); 
    255255            memcpy( (uint8_t*)p_dec->fmt_out.p_extra+p_sys->p_sps->i_buffer, p_sys->p_pps->p_buffer, p_sys->p_pps->i_buffer); 
    256256            p_sys->b_header = VLC_TRUE; 
    257257        } 
     258        else p_dec->fmt_out.i_extra = 0; 
     259 
    258260        /* Set callback */ 
    259261        p_dec->pf_packetize = PacketizeAVC1; 
    …… 
    486488    uint8_t *dst = malloc( i_src ); 
    487489 
     490    *pp_ret = dst; 
     491 
    488492    if( dst ) 
    489493    { 
    490         *pp_ret = dst; 
    491  
    492494        while( src < end ) 
    493495        {