highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/snow: Move initializing HpelDSPContext to snowenc.c

Browse Source 
Only used by the encoder.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-10-09 06:20:33 +02:00
parent abaf02a7e7
commit 433925ac4d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -2979,7 +2979,7 @@ screenpresso_decoder_deps="zlib"
shorten_decoder_select="bswapdsp" shorten_decoder_select="bswapdsp"
sipr_decoder_select="lsp" sipr_decoder_select="lsp"
smvjpeg_decoder_select="mjpeg_decoder" smvjpeg_decoder_select="mjpeg_decoder"
snow_decoder_select="dwt h264qpel hpeldsp rangecoder videodsp" snow_decoder_select="dwt h264qpel rangecoder videodsp"
snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp" snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp"
sonic_decoder_select="golomb rangecoder" sonic_decoder_select="golomb rangecoder"
sonic_encoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder"

1
libavcodec/snow.c
View File

@@ -401,7 +401,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
s->max_ref_frames=1; //just make sure it's not an invalid value in case of no initial keyframe s->max_ref_frames=1; //just make sure it's not an invalid value in case of no initial keyframe
s->spatial_decomposition_count = 1; s->spatial_decomposition_count = 1;
ff_hpeldsp_init(&s->hdsp, avctx->flags);
ff_videodsp_init(&s->vdsp, 8); ff_videodsp_init(&s->vdsp, 8);
ff_dwt_init(&s->dwt); ff_dwt_init(&s->dwt);
ff_h264qpel_init(&s->h264qpel, 8); ff_h264qpel_init(&s->h264qpel, 8);

2
libavcodec/snowenc.c
View File

@@ -152,6 +152,8 @@ static av_cold int encode_init(AVCodecContext *avctx)
s->plane[plane_index].fast_mc= 1; s->plane[plane_index].fast_mc= 1;
} }
// Must be before ff_snow_common_init()
ff_hpeldsp_init(&s->hdsp, avctx->flags);
if ((ret = ff_snow_common_init(avctx)) < 0) { if ((ret = ff_snow_common_init(avctx)) < 0) {
return ret; return ret;
} }