diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-09 05:54:18 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-12 10:58:15 +0200 |
| commit | 28ac2279adb860ea8b90d3073603912bf3eb6a83 (patch) | |
| tree | 8ae63024393413bc293408d02f49f6bb2aab6e4d | |
| parent | 2a7ee6dda0184e6ba8b07a2b577f365fd068bd3e (diff) | |
| download | ffmpeg-28ac2279adb860ea8b90d3073603912bf3eb6a83.tar.gz | |
avcodec/snow: Move initializing MotionEstContext to snowenc.c
Only used by the encoder.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/snow.c | 2 | ||||
| -rw-r--r-- | libavcodec/snowenc.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -2946,7 +2946,7 @@ screenpresso_decoder_deps="zlib" shorten_decoder_select="bswapdsp" sipr_decoder_select="lsp" smvjpeg_decoder_select="mjpeg_decoder" -snow_decoder_select="dwt h264qpel hpeldsp me_cmp rangecoder videodsp" +snow_decoder_select="dwt h264qpel hpeldsp rangecoder videodsp" snow_encoder_select="dwt h264qpel hpeldsp me_cmp mpegvideoenc rangecoder videodsp" sonic_decoder_select="golomb rangecoder" sonic_encoder_select="golomb rangecoder" diff --git a/libavcodec/snow.c b/libavcodec/snow.c index aa15fccc42..cde09902c3 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -23,7 +23,6 @@ #include "avcodec.h" #include "decode.h" #include "encode.h" -#include "me_cmp.h" #include "snow_dwt.h" #include "snow.h" #include "snowdata.h" @@ -434,7 +433,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->spatial_decomposition_count = 1; - ff_me_cmp_init(&s->mecc, avctx); ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_videodsp_init(&s->vdsp, 8); ff_dwt_init(&s->dwt); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index c5ff50639e..ea0d4fc27f 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "codec_internal.h" #include "encode.h" +#include "me_cmp.h" #include "packet_internal.h" #include "snow_dwt.h" #include "snow.h" @@ -66,6 +67,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_snow_common_init(avctx)) < 0) { return ret; } + ff_me_cmp_init(&s->mecc, avctx); ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx); ff_snow_alloc_blocks(s); |