comparison h264.c @ 3954:00a12ef7d800 libavcodec

output typo fixes
author diego
date Sun, 08 Oct 2006 10:11:58 +0000
parents 3edbf131ee44
children 051a9c8b257f
comparison
equal deleted inserted replaced
3953:ded320ef2a87 3954:00a12ef7d800
5192 } 5192 }
5193 }else{ 5193 }else{
5194 assert(h->slice_type == I_TYPE); 5194 assert(h->slice_type == I_TYPE);
5195 decode_intra_mb: 5195 decode_intra_mb:
5196 if(mb_type > 25){ 5196 if(mb_type > 25){
5197 av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice to large at %d %d\n", mb_type, av_get_pict_type_char(h->slice_type), s->mb_x, s->mb_y); 5197 av_log(h->s.avctx, AV_LOG_ERROR, "mb_type %d in %c slice too large at %d %d\n", mb_type, av_get_pict_type_char(h->slice_type), s->mb_x, s->mb_y);
5198 return -1; 5198 return -1;
5199 } 5199 }
5200 partition_count=0; 5200 partition_count=0;
5201 cbp= i_mb_type_info[mb_type].cbp; 5201 cbp= i_mb_type_info[mb_type].cbp;
5202 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode; 5202 h->intra16x16_pred_mode= i_mb_type_info[mb_type].pred_mode;
7811 7811
7812 sps->direct_8x8_inference_flag= get_bits1(&s->gb); 7812 sps->direct_8x8_inference_flag= get_bits1(&s->gb);
7813 7813
7814 #ifndef ALLOW_INTERLACE 7814 #ifndef ALLOW_INTERLACE
7815 if(sps->mb_aff) 7815 if(sps->mb_aff)
7816 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it compilation time\n"); 7816 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF support not included; enable it at compile-time.\n");
7817 #endif 7817 #endif
7818 if(!sps->direct_8x8_inference_flag && sps->mb_aff) 7818 if(!sps->direct_8x8_inference_flag && sps->mb_aff)
7819 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n"); 7819 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + !direct_8x8_inference is not implemented\n");
7820 7820
7821 sps->crop= get_bits1(&s->gb); 7821 sps->crop= get_bits1(&s->gb);