Merge commit '5735552f1f17ea01dcbc99b08f54b5bf52176a8f'

[ffmpeg] / libavcodec / mpeg4videoenc.c

diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c
index f93811947658eb1966abffb44df45743206a7570..6a3d7e73310df4138cdb260857deae194fd8cf7f 100644 (file)
--- a/libavcodec/mpeg4videoenc.c
+++ b/libavcodec/mpeg4videoenc.c
@@ -698,7 +698,7 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64],
                             }
                             diff = diff * 256 / (xe * ye);
                         } else {
-                            diff = s->dsp.sad[0](NULL, p_pic, b_pic, s->linesize, 16);
+                            diff = s->mecc.sad[0](NULL, p_pic, b_pic, s->linesize, 16);
                         }
                         if (diff > s->qscale * 70) {  // FIXME check that 70 is optimal
                             s->mb_skipped = 0;