Changeset 20ef751349165a5edf4da20f2e172cd52802cb02

Show
Ignore:
Timestamp:
30/08/06 01:02:13 (2 years ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1156892533 +0000
git-parent:

[5cd642814a0249537ea7d4ce99cfc7f5a5a26426]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1156892533 +0000
Message:

* copy [16427] to the switcher module as well. ( is times 3 bytes enough ? perhaps i should use 4 bytes per pixel ? )

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/stream_out/switcher.c

    r4448a18 r20ef751  
    5252#define MAX_PICTURES 10 
    5353#define MAX_AUDIO 30 
    54 #define AVCODEC_MAX_VIDEO_FRAME_SIZE (3*1024*1024) 
    5554#define MAX_THRESHOLD 99999999 
    5655 
    …… 
    780779        } 
    781780 
    782         id->p_buffer_out = malloc( AVCODEC_MAX_VIDEO_FRAME_SIZE ); 
     781        id->p_buffer_out = malloc( id->ff_enc_c->width * id->ff_enc_c->height * 3 ); 
    783782        id->p_frame = avcodec_alloc_frame(); 
    784783        id->p_frame->linesize[0] = p_sys->p_pictures[p_sys->i_cmd-1].p[0].i_pitch; 
    …… 
    834833 
    835834    i_out = avcodec_encode_video( id->ff_enc_c, id->p_buffer_out, 
    836                                   AVCODEC_MAX_VIDEO_FRAME_SIZE, 
     835                                  id->ff_enc_c->width * id->ff_enc_c->height * 3, 
    837836                                  id->p_frame ); 
    838837