[FFmpeg-cvslog] avcodec/mobiclip: Don't use too big max_depth, inline constants
Andreas Rheinhardt
git at videolan.org
Mon Oct 26 09:21:27 EET 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sat Oct 24 12:26:51 2020 +0200| [924bc6d8602f3fdad3adbd5d18e49877bdb8b2ef] | committer: Andreas Rheinhardt
avcodec/mobiclip: Don't use too big max_depth, inline constants
Reviewed-by: Michael Niedermayer <michael at niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=924bc6d8602f3fdad3adbd5d18e49877bdb8b2ef
---
libavcodec/mobiclip.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c
index d209a53b07..ab4baac099 100644
--- a/libavcodec/mobiclip.c
+++ b/libavcodec/mobiclip.c
@@ -31,6 +31,7 @@
#include "golomb.h"
#include "internal.h"
+#define MOBI_RL_VLC_BITS 12
#define MOBI_MV_VLC_BITS 6
static const uint8_t zigzag4x4_tab[] =
@@ -340,14 +341,14 @@ static av_cold int mobiclip_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
- ret = ff_init_vlc_sparse(&s->vlc[0], 12, 104,
+ ret = ff_init_vlc_sparse(&s->vlc[0], MOBI_RL_VLC_BITS, 104,
bits0, sizeof(*bits0), sizeof(*bits0),
codes0, sizeof(*codes0), sizeof(*codes0),
syms0, sizeof(*syms0), sizeof(*syms0), 0);
if (ret < 0)
return ret;
- ret = ff_init_vlc_sparse(&s->vlc[1], 12, 104,
+ ret = ff_init_vlc_sparse(&s->vlc[1], MOBI_RL_VLC_BITS, 104,
bits0, sizeof(*bits0), sizeof(*bits0),
codes0, sizeof(*codes0), sizeof(*codes0),
syms1, sizeof(*syms1), sizeof(*syms1), 0);
@@ -465,7 +466,7 @@ static void read_run_encoding(AVCodecContext *avctx,
MobiClipContext *s = avctx->priv_data;
GetBitContext *gb = &s->gb;
int n = get_vlc2(gb, s->vlc[s->dct_tab_idx].table,
- s->vlc[s->dct_tab_idx].bits, 2);
+ MOBI_RL_VLC_BITS, 1);
*last = (n >> 11) == 1;
*run = (n >> 5) & 0x3F;
More information about the ffmpeg-cvslog
mailing list