diff mbox series

[FFmpeg-devel,25/30] avcodec/mpegvideo_motion: Don't duplicate identical code

Message ID AM7PR03MB666045F47021AE533C1A74F98F7E9@AM7PR03MB6660.eurprd03.prod.outlook.com
State Accepted
Commit f5ddf0ab197cb88bac3ce361481a0408f5fd8ea7
Headers show
Series [FFmpeg-devel,01/14] avcodec/mjpegenc: Use custom close function directly | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc fail Make fate failed

Commit Message

Andreas Rheinhardt Dec. 23, 2021, 9:13 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/mpegvideo_motion.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

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,