virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mpeg4video: Move IS_3IV1 macro to mpeg4videodec.c

Browse Source 
Also add parentheses around the replacement to make it safer.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-03 01:12:02 +01:00
parent 5df8c86b24
commit 70359de69f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpeg4video.h
View File

@@ -36,12 +36,6 @@ void ff_mpeg4_init_direct_mv(MpegEncContext *s);
*/ */
int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); 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. * Predict the dc.
* @param n block index (0-3 are luma, 4-5 are chroma) * @param n block index (0-3 are luma, 4-5 are chroma)

6
libavcodec/mpeg4videodec.c
View File

@@ -49,6 +49,12 @@
#include "xvididct.h" #include "xvididct.h"
#include "unary.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 /* 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 * 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 * be aware though that decreasing them may need the number of stages that is