Mercurial > libavcodec.hg
comparison mpegvideo.c @ 5127:4dbe6578f811 libavcodec
misc spelling fixes
author | diego |
---|---|
date | Tue, 12 Jun 2007 09:29:25 +0000 |
parents | cf6608b00186 |
children | 0244bba24b43 |
comparison
equal
deleted
inserted
replaced
5126:7982b376b58a | 5127:4dbe6578f811 |
---|---|
370 /** | 370 /** |
371 * allocates a Picture | 371 * allocates a Picture |
372 * The pixels are allocated/set by calling get_buffer() if shared=0 | 372 * The pixels are allocated/set by calling get_buffer() if shared=0 |
373 */ | 373 */ |
374 static int alloc_picture(MpegEncContext *s, Picture *pic, int shared){ | 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 const int mb_array_size= s->mb_stride*s->mb_height; | 376 const int mb_array_size= s->mb_stride*s->mb_height; |
377 const int b8_array_size= s->b8_stride*s->mb_height*2; | 377 const int b8_array_size= s->b8_stride*s->mb_height*2; |
378 const int b4_array_size= s->b4_stride*s->mb_height*4; | 378 const int b4_array_size= s->b4_stride*s->mb_height*4; |
379 int i; | 379 int i; |
380 | 380 |
490 | 490 |
491 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264) | 491 // edge emu needs blocksize + filter length - 1 (=17x17 for halfpel / 21x21 for h264) |
492 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*21*2); //(width + edge + align)*interlaced*MBsize*tolerance | 492 CHECKED_ALLOCZ(s->allocated_edge_emu_buffer, (s->width+64)*2*21*2); //(width + edge + align)*interlaced*MBsize*tolerance |
493 s->edge_emu_buffer= s->allocated_edge_emu_buffer + (s->width+64)*2*21; | 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 CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t)) | 496 CHECKED_ALLOCZ(s->me.scratchpad, (s->width+64)*4*16*2*sizeof(uint8_t)) |
497 s->rd_scratchpad= s->me.scratchpad; | 497 s->rd_scratchpad= s->me.scratchpad; |
498 s->b_scratchpad= s->me.scratchpad; | 498 s->b_scratchpad= s->me.scratchpad; |
499 s->obmc_scratchpad= s->me.scratchpad + 16; | 499 s->obmc_scratchpad= s->me.scratchpad + 16; |
500 if (s->encoding) { | 500 if (s->encoding) { |
1631 | 1631 |
1632 s->hurry_up= s->avctx->hurry_up; | 1632 s->hurry_up= s->avctx->hurry_up; |
1633 s->error_resilience= avctx->error_resilience; | 1633 s->error_resilience= avctx->error_resilience; |
1634 | 1634 |
1635 /* set dequantizer, we can't do it during init as it might change for mpeg4 | 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 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){ | 1637 if(s->mpeg_quant || s->codec_id == CODEC_ID_MPEG2VIDEO){ |
1638 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; | 1638 s->dct_unquantize_intra = s->dct_unquantize_mpeg2_intra; |
1639 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; | 1639 s->dct_unquantize_inter = s->dct_unquantize_mpeg2_inter; |
1640 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ | 1640 }else if(s->out_format == FMT_H263 || s->out_format == FMT_H261){ |
1641 s->dct_unquantize_intra = s->dct_unquantize_h263_intra; | 1641 s->dct_unquantize_intra = s->dct_unquantize_h263_intra; |