diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-07 18:07:54 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-12 18:29:10 +0200 |
| commit | 4e65a41a5cfdcafb0c9d26b7e531daa3a1b5fde2 (patch) | |
| tree | 88b21eaa86b4c579a385966892cdf1fa6464f4e9 | |
| parent | 7e241a1b73bcca768f48ff1851e9e9f3f0752000 (diff) | |
| download | ffmpeg-4e65a41a5cfdcafb0c9d26b7e531daa3a1b5fde2.tar.gz | |
avcodec/rv34: Move dsp init code to rv30/rv40
It avoids both runtime and compile-time checks.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/rv30.c | 1 | ||||
| -rw-r--r-- | libavcodec/rv34.c | 9 | ||||
| -rw-r--r-- | libavcodec/rv40.c | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 36cd5345fd..e2b75fbec0 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -285,6 +285,7 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) r->loop_filter = rv30_loop_filter; r->luma_dc_quant_i = rv30_luma_dc_quant; r->luma_dc_quant_p = rv30_luma_dc_quant; + ff_rv30dsp_init(&r->rdsp); return 0; } diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 99e580a09a..e68072de06 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1503,15 +1503,6 @@ av_cold int ff_rv34_decode_init(AVCodecContext *avctx) ff_h264_pred_init(&r->h, AV_CODEC_ID_RV40, 8, 1); -#if CONFIG_RV30_DECODER - if (avctx->codec_id == AV_CODEC_ID_RV30) - ff_rv30dsp_init(&r->rdsp); -#endif -#if CONFIG_RV40_DECODER - if (avctx->codec_id == AV_CODEC_ID_RV40) - ff_rv40dsp_init(&r->rdsp); -#endif - if ((ret = rv34_decoder_alloc(r)) < 0) { ff_mpv_common_end(&r->s); return ret; diff --git a/libavcodec/rv40.c b/libavcodec/rv40.c index e0903226b9..8532a872d9 100644 --- a/libavcodec/rv40.c +++ b/libavcodec/rv40.c @@ -567,6 +567,7 @@ static av_cold int rv40_decode_init(AVCodecContext *avctx) r->loop_filter = rv40_loop_filter; r->luma_dc_quant_i = rv40_luma_dc_quant[0]; r->luma_dc_quant_p = rv40_luma_dc_quant[1]; + ff_rv40dsp_init(&r->rdsp); return 0; } |