Mercurial > libavcodec.hg

diff motion_est.c @ 6481:493dc59d469a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add FF_ prefix to all (frame)_TYPE usage
author aurel
date Sun, 09 Mar 2008 23:31:02 +0000
parents 470601203f44
children 224b51e2c960
line wrap: on
line diff
--- a/motion_est.c	Sun Mar 09 17:05:19 2008 +0000
+++ b/motion_est.c	Sun Mar 09 23:31:02 2008 +0000
@@ -2026,7 +2026,7 @@
                             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 @@
     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);