ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Mon Mar 3 01:12:02 2025 +0100| [70359de69fe0e800bec2171a703e1ad57b980b1c] | committer: Andreas Rheinhardt
avcodec/mpeg4video: Move IS_3IV1 macro to mpeg4videodec.c Also add parentheses around the replacement to make it safer. Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70359de69fe0e800bec2171a703e1ad57b980b1c --- 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..139b6d4b08 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
