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>

diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c
index 36cd5345fdc7fa596071a0783bb80c11cc8392c6..e2b75fbec0e0317fad113bd7d93bd7daa9509529 100644 (file)
--- 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 99e580a09abe73cc3ea57e6c42e7b6c2aac56bfd..e68072de067cdee54954cad67dbd4353953fcb08 100644 (file)
--- 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 e0903226b9c3c2342ec5f2a7bc2cb7fb00d1b0eb..8532a872d933c17d362128c18170602860936637 100644 (file)
--- 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;
 }