summaryrefslogtreecommitdiff
path: root/libavcodec/motion_est.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-11-10 11:46:59 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-11-10 11:46:59 +0000
commitb8a78f419dd67cebc70f78e3d183c7eb4ed10c0e (patch)
treef502064c04d45369a01aa2722ac173b80301b8d3 /libavcodec/motion_est.c
parentf11d3f23105f8c7e195990ab2c1728d3dd2f206f (diff)
reversing header game
MIN/MAX -> FFMIN/FFMAX Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/motion_est.c')
-rw-r--r--libavcodec/motion_est.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index e94657dcaa..81447b3b66 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1600,8 +1600,8 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type)
i= y*s->mb_width;
for(x=0; x<s->mb_width; x++){
if(s->mb_type[i] & type){
- int fcode= MAX(fcode_tab[mv_table[xy][0] + MAX_MV],
- fcode_tab[mv_table[xy][1] + MAX_MV]);
+ int fcode= FFMAX(fcode_tab[mv_table[xy][0] + MAX_MV],
+ fcode_tab[mv_table[xy][1] + MAX_MV]);
int j;
for(j=0; j<fcode && j<8; j++){