From 0f22de2d0117026b009e55a81ed95e17784ebb08 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 3 Mar 2025 01:12:02 +0100 Subject: [PATCH 21/40] avcodec/mpeg4video: Move IS_3IV1 macro to mpeg4videodec.c Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4video.h | 6 ------ libavcodec/mpeg4videodec.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index 9ac18943a2..cfc6dcb684 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -36,12 +36,6 @@ void ff_mpeg4_init_direct_mv(MpegEncContext *s); */ int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); -#if 0 //3IV1 is quite rare and it slows things down a tiny bit -#define IS_3IV1 s->codec_tag == AV_RL32("3IV1") -#else -#define IS_3IV1 0 -#endif - /** * Predict the dc. * @param n block index (0-3 are luma, 4-5 are chroma) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 31d00dd0b9..f4cfb8a18f 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -49,6 +49,12 @@ #include "xvididct.h" #include "unary.h" +#if 0 //3IV1 is quite rare and it slows things down a tiny bit +#define IS_3IV1 s->codec_tag == AV_RL32("3IV1") +#else +#define IS_3IV1 0 +#endif + /* The defines below define the number of bits that are read at once for * reading vlc values. Changing these may improve speed and data cache needs * be aware though that decreasing them may need the number of stages that is -- 2.45.2