virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Code Issues Releases Activity

avcodec/wmv2dec: Remove unnecessary ScanTables

Browse Source 
Only ScanTable.scantable is used for the abt_scantables.

Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-10-20 05:56:44 +02:00
parent da93e4fb27
commit de133d22da
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/wmv2dec.c
View File

@ -52,7 +52,6 @@ typedef struct WMV2DecContext {
int per_mb_rl_bit; int per_mb_rl_bit;
int skip_type; int skip_type;
ScanTable abt_scantable[2];
DECLARE_ALIGNED(32, int16_t, abt_block2)[6][64]; DECLARE_ALIGNED(32, int16_t, abt_block2)[6][64];
} WMV2DecContext; } WMV2DecContext;
@ -425,9 +424,7 @@ static inline int wmv2_decode_inter_block(WMV2DecContext *w, int16_t *block,
w->abt_type_table[n] = w->abt_type; w->abt_type_table[n] = w->abt_type;
if (w->abt_type) { if (w->abt_type) {
// const uint8_t *scantable = w->abt_scantable[w->abt_type - 1].permutated; const uint8_t *scantable = w->abt_type == 1 ? ff_wmv2_scantableA : ff_wmv2_scantableB;
const uint8_t *scantable = w->abt_scantable[w->abt_type - 1].scantable;
// const uint8_t *scantable = w->abt_type - 1 ? w->abt_scantable[1].permutated : w->abt_scantable[0].scantable;
sub_cbp = sub_cbp_table[decode012(&s->gb)]; sub_cbp = sub_cbp_table[decode012(&s->gb)];
@ -577,10 +574,6 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
return ret; return ret;
ff_wmv2_common_init(s); ff_wmv2_common_init(s);
ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[0],
ff_wmv2_scantableA);
ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1],
ff_wmv2_scantableB);
return ff_intrax8_common_init(avctx, &w->x8, return ff_intrax8_common_init(avctx, &w->x8,
w->s.block, w->s.block_last_index, w->s.block, w->s.block_last_index,