Revision 755bfeab libavcodec/mpegvideo.c

View differences:

libavcodec/mpegvideo.c
372 372
 * The pixels are allocated/set by calling get_buffer() if shared=0
373 373
 */
374 374
static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
375
    const int big_mb_num= s->mb_stride*(s->mb_height+1) + 1; //the +1 is needed so memset(,,stride*height) doesnt sig11
375
    const int big_mb_num= s->mb_stride*(s->mb_height+1) + 1; //the +1 is needed so memset(,,stride*height) does not sig11
376 376
    const int mb_array_size= s->mb_stride*s->mb_height;
377 377
    const int b8_array_size= s->b8_stride*s->mb_height*2;
378 378
    const int b4_array_size= s->b4_stride*s->mb_height*4;
......
492 492
    CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*21*2); //(width + edge + align)*interlaced*MBsize*tolerance
493 493
    s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*21;
494 494

  
495
     //FIXME should be linesize instead of s->width*2 but that isnt known before get_buffer()
495
     //FIXME should be linesize instead of s->width*2 but that is not known before get_buffer()
496 496
    CHECKED_ALLOCZ(s->me.scratchpad,  (s->width+64)*4*16*2*sizeof(uint8_t))
497 497
    s->rd_scratchpad=   s->me.scratchpad;
498 498
    s->b_scratchpad=    s->me.scratchpad;
......
1633 1633
    s->error_resilience= avctx->error_resilience;
1634 1634

  
1635 1635
    /* set dequantizer, we can't do it during init as it might change for mpeg4
1636
       and we can't do it in the header decode as init isnt called for mpeg4 there yet */
1636
       and we can't do it in the header decode as init is not called for mpeg4 there yet */
1637 1637
    if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){
1638 1638
        s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra;
1639 1639
        s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter;

Also available in: Unified diff