diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-09 23:31:02 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-09 23:31:02 +0000 |
| commit | 9701840bb539546bc0cfb1307b04655140851b04 (patch) | |
| tree | 283d60d225a87c960c78d20975491802b3385797 /libavcodec/motion_est.c | |
| parent | 88855b51cdba35c2e7daf8351645d91cf85cb8af (diff) | |
add FF_ prefix to all (frame)_TYPE usage
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 16db0f87c9..54bc93da38 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -2026,7 +2026,7 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type) continue; for(j=0; j<fcode && j<8; j++){ - if(s->pict_type==B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy]) + if(s->pict_type==FF_B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy]) score[j]-= 170; } } @@ -2058,7 +2058,7 @@ void ff_fix_long_p_mvs(MpegEncContext * s) MotionEstContext * const c= &s->me; const int f_code= s->f_code; int y, range; - assert(s->pict_type==P_TYPE); + assert(s->pict_type==FF_P_TYPE); range = (((s->out_format == FMT_MPEG1 || s->msmpeg4_version) ? 8 : 16) << f_code); |