comparison motion_est.c @ 6481:493dc59d469a libavcodec

add FF_ prefix to all (frame)_TYPE usage
author aurel
date Sun, 09 Mar 2008 23:31:02 +0000
parents 470601203f44
children 224b51e2c960
comparison
equal deleted inserted replaced
6480:6f01a499e785 6481:493dc59d469a
2024 if(mx >= range || mx < -range || 2024 if(mx >= range || mx < -range ||
2025 my >= range || my < -range) 2025 my >= range || my < -range)
2026 continue; 2026 continue;
2027 2027
2028 for(j=0; j<fcode && j<8; j++){ 2028 for(j=0; j<fcode && j<8; j++){
2029 if(s->pict_type==B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy]) 2029 if(s->pict_type==FF_B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy])
2030 score[j]-= 170; 2030 score[j]-= 170;
2031 } 2031 }
2032 } 2032 }
2033 xy++; 2033 xy++;
2034 } 2034 }
2056 void ff_fix_long_p_mvs(MpegEncContext * s) 2056 void ff_fix_long_p_mvs(MpegEncContext * s)
2057 { 2057 {
2058 MotionEstContext * const c= &s->me; 2058 MotionEstContext * const c= &s->me;
2059 const int f_code= s->f_code; 2059 const int f_code= s->f_code;
2060 int y, range; 2060 int y, range;
2061 assert(s->pict_type==P_TYPE); 2061 assert(s->pict_type==FF_P_TYPE);
2062 2062
2063 range = (((s->out_format == FMT_MPEG1 || s->msmpeg4_version) ? 8 : 16) << f_code); 2063 range = (((s->out_format == FMT_MPEG1 || s->msmpeg4_version) ? 8 : 16) << f_code);
2064 2064
2065 assert(range <= 16 || !s->msmpeg4_version); 2065 assert(range <= 16 || !s->msmpeg4_version);
2066 assert(range <=256 || !(s->codec_id == CODEC_ID_MPEG2VIDEO && s->avctx->strict_std_compliance >= FF_COMPLIANCE_NORMAL)); 2066 assert(range <=256 || !(s->codec_id == CODEC_ID_MPEG2VIDEO && s->avctx->strict_std_compliance >= FF_COMPLIANCE_NORMAL));