RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-11 06:58:18 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/wmv2: Move initializing abt_scantables to the decoder

Browse Source 
They are not used by the encoder at all.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-01-27 23:05:13 +01:00
parent b81a29d180
commit 584f26db0d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/wmv2.c
View File

@ -20,11 +20,9 @@
#include "avcodec.h" #include "avcodec.h"
#include "idctdsp.h" #include "idctdsp.h"
#include "mpegutils.h"
#include "mpegvideo.h" #include "mpegvideo.h"
#include "msmpeg4data.h" #include "msmpeg4data.h"
#include "wmv2.h" #include "wmv2.h"
#include "wmv2data.h"
av_cold void ff_wmv2_common_init(Wmv2Context *w) av_cold void ff_wmv2_common_init(Wmv2Context *w)
@ -36,10 +34,6 @@ av_cold void ff_wmv2_common_init(Wmv2Context *w)
s->idsp.perm_type = w->wdsp.idct_perm; s->idsp.perm_type = w->wdsp.idct_perm;
ff_init_scantable_permutation(s->idsp.idct_permutation, ff_init_scantable_permutation(s->idsp.idct_permutation,
w->wdsp.idct_perm); w->wdsp.idct_perm);
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);
ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable,
ff_wmv1_scantable[1]); ff_wmv1_scantable[1]);
ff_init_scantable(s->idsp.idct_permutation, &s->intra_h_scantable, ff_init_scantable(s->idsp.idct_permutation, &s->intra_h_scantable,

6
libavcodec/wmv2dec.c
View File

@ -29,6 +29,7 @@
#include "msmpeg4data.h" #include "msmpeg4data.h"
#include "simple_idct.h" #include "simple_idct.h"
#include "wmv2.h" #include "wmv2.h"
#include "wmv2data.h"
static void wmv2_add_block(Wmv2Context *w, int16_t *block1, static void wmv2_add_block(Wmv2Context *w, int16_t *block1,
@ -537,12 +538,17 @@ int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64])
static av_cold int wmv2_decode_init(AVCodecContext *avctx) static av_cold int wmv2_decode_init(AVCodecContext *avctx)
{ {
Wmv2Context *const w = avctx->priv_data; Wmv2Context *const w = avctx->priv_data;
MpegEncContext *const s = &w->s;
int ret; int ret;
if ((ret = ff_msmpeg4_decode_init(avctx)) < 0) if ((ret = ff_msmpeg4_decode_init(avctx)) < 0)
return ret; return ret;
ff_wmv2_common_init(w); ff_wmv2_common_init(w);
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, &w->s.idsp, return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp,
w->s.block, w->s.block_last_index, w->s.block, w->s.block_last_index,