mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
avcodec/hqx: Inline constants
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
parent
b1af617f51
commit
a03caa384f
@ -197,7 +197,7 @@ static int hqx_decode_422a(HQXContext *ctx, int slice_no, int x, int y)
|
||||
int i, ret;
|
||||
int cbp;
|
||||
|
||||
cbp = get_vlc2(gb, ctx->cbp_vlc.table, ctx->cbp_vlc.bits, 1);
|
||||
cbp = get_vlc2(gb, ctx->cbp_vlc.table, HQX_CBP_VLC_BITS, 1);
|
||||
|
||||
for (i = 0; i < 12; i++)
|
||||
memset(slice->block[i], 0, sizeof(**slice->block) * 64);
|
||||
@ -283,7 +283,7 @@ static int hqx_decode_444a(HQXContext *ctx, int slice_no, int x, int y)
|
||||
int i, ret;
|
||||
int cbp;
|
||||
|
||||
cbp = get_vlc2(gb, ctx->cbp_vlc.table, ctx->cbp_vlc.bits, 1);
|
||||
cbp = get_vlc2(gb, ctx->cbp_vlc.table, HQX_CBP_VLC_BITS, 1);
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
memset(slice->block[i], 0, sizeof(**slice->block) * 64);
|
||||
|
@ -77,6 +77,7 @@ typedef struct HQXContext {
|
||||
VLC dc_vlc[3];
|
||||
} HQXContext;
|
||||
|
||||
#define HQX_CBP_VLC_BITS 5
|
||||
#define HQX_DC_VLC_BITS 9
|
||||
|
||||
extern const HQXAC ff_hqx_ac[NUM_HQX_AC];
|
||||
|
@ -2150,7 +2150,7 @@ const HQXAC ff_hqx_ac[NUM_HQX_AC] = {
|
||||
|
||||
av_cold int ff_hqx_init_vlcs(HQXContext *ctx)
|
||||
{
|
||||
int ret = init_vlc(&ctx->cbp_vlc, 5, FF_ARRAY_ELEMS(cbp_vlc_lens),
|
||||
int ret = init_vlc(&ctx->cbp_vlc, HQX_CBP_VLC_BITS, FF_ARRAY_ELEMS(cbp_vlc_lens),
|
||||
cbp_vlc_lens, 1, 1, cbp_vlc_bits, 1, 1, 0);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user