comparison mpegvideo.c @ 843:8c81f1ee9271 libavcodec

cleanup
author michaelni
date Sat, 09 Nov 2002 10:38:34 +0000
parents e460775adb38
children f3c369b8ddca
comparison
equal deleted inserted replaced
842:e460775adb38 843:8c81f1ee9271
408 /* cbp values */ 408 /* cbp values */
409 CHECKED_ALLOCZ(s->coded_block, y_size); 409 CHECKED_ALLOCZ(s->coded_block, y_size);
410 410
411 /* divx501 bitstream reorder buffer */ 411 /* divx501 bitstream reorder buffer */
412 CHECKED_ALLOCZ(s->bitstream_buffer, BITSTREAM_BUFFER_SIZE); 412 CHECKED_ALLOCZ(s->bitstream_buffer, BITSTREAM_BUFFER_SIZE);
413 413
414 /* cbp, ac_pred, pred_dir */ 414 /* cbp, ac_pred, pred_dir */
415 CHECKED_ALLOCZ(s->cbp_table , s->mb_num * sizeof(UINT8)) 415 CHECKED_ALLOCZ(s->cbp_table , s->mb_num * sizeof(UINT8))
416 CHECKED_ALLOCZ(s->pred_dir_table, s->mb_num * sizeof(UINT8)) 416 CHECKED_ALLOCZ(s->pred_dir_table, s->mb_num * sizeof(UINT8))
417 } 417 }
418 418
994 994
995 s->input_qscale = avctx->quality; 995 s->input_qscale = avctx->quality;
996 996
997 init_put_bits(&s->pb, buf, buf_size, NULL, NULL); 997 init_put_bits(&s->pb, buf, buf_size, NULL, NULL);
998 998
999 if(avctx->flags&CODEC_FLAG_TYPE){ 999 if(avctx->force_type){
1000 s->input_pict_type= 1000 s->input_pict_type=
1001 s->force_input_type= avctx->key_frame ? I_TYPE : P_TYPE; 1001 s->force_input_type= avctx->force_type;
1002 }else if(s->flags&CODEC_FLAG_PASS2){ 1002 }else if(s->flags&CODEC_FLAG_PASS2){
1003 s->input_pict_type= 1003 s->input_pict_type=
1004 s->force_input_type= s->rc_context.entry[s->input_picture_number].new_pict_type; 1004 s->force_input_type= s->rc_context.entry[s->input_picture_number].new_pict_type;
1005 }else{ 1005 }else{
1006 s->force_input_type=0; 1006 s->force_input_type=0;