[FFmpeg-cvslog] avcodec/mpegvideo_motion: Don't duplicate identical code

Andreas Rheinhardt git at videolan.org
Tue Jan 4 18:21:04 EET 2022


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Dec 23 04:03:46 2021 +0100| [f5ddf0ab197cb88bac3ce361481a0408f5fd8ea7] | committer: Andreas Rheinhardt

avcodec/mpegvideo_motion: Don't duplicate identical code

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5ddf0ab197cb88bac3ce361481a0408f5fd8ea7
---

 libavcodec/mpegvideo_motion.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c
index 427bc96887..876a7375f8 100644
--- a/libavcodec/mpegvideo_motion.c
+++ b/libavcodec/mpegvideo_motion.c
@@ -839,8 +839,6 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s,
     int i;
     int mb_y = s->mb_y;
 
-    prefetch_motion(s, ref_picture, dir);
-
     if (!is_mpeg12 && s->obmc && s->pict_type != AV_PICTURE_TYPE_B) {
         apply_obmc(s, dest_y, dest_cb, dest_cr, ref_picture, pix_op);
         return;
@@ -978,6 +976,8 @@ void ff_mpv_motion(MpegEncContext *s,
                    op_pixels_func (*pix_op)[4],
                    qpel_mc_func (*qpix_op)[16])
 {
+    prefetch_motion(s, ref_picture, dir);
+
 #if !CONFIG_SMALL
     if (s->out_format == FMT_MPEG1)
         mpv_motion_internal(s, dest_y, dest_cb, dest_cr, dir,



More information about the ffmpeg-cvslog mailing list