[FFmpeg-cvslog] libvpxdec: Correct linking against variables.

Matt Oliver git at videolan.org
Thu Nov 25 07:29:44 EET 2021


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Wed Oct 20 06:28:53 2021 +1100| [1a5930b55494b5d598c618283b24f12ad1ac38a2] | committer: Matt Oliver

libvpxdec: Correct linking against variables.

Instead link against the function that returns the correct variable. This fixes linking errors with dlls with msvc.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a5930b55494b5d598c618283b24f12ad1ac38a2
---

 libavcodec/libvpxdec.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c
index 42d1b8ab1c..b2aa205036 100644
--- a/libavcodec/libvpxdec.c
+++ b/libavcodec/libvpxdec.c
@@ -242,11 +242,11 @@ static int vpx_decode(AVCodecContext *avctx,
                                &ctx->decoder_alpha,
 #if CONFIG_LIBVPX_VP8_DECODER && CONFIG_LIBVPX_VP9_DECODER
                                (avctx->codec_id == AV_CODEC_ID_VP8) ?
-                               &vpx_codec_vp8_dx_algo : &vpx_codec_vp9_dx_algo
+                               vpx_codec_vp8_dx() : vpx_codec_vp9_dx()
 #elif CONFIG_LIBVPX_VP8_DECODER
-                               &vpx_codec_vp8_dx_algo
+                               vpx_codec_vp8_dx()
 #else
-                               &vpx_codec_vp9_dx_algo
+                               vpx_codec_vp9_dx()
 #endif
                                );
                 if (ret)
@@ -350,7 +350,7 @@ static av_cold int vpx_free(AVCodecContext *avctx)
 static av_cold int vp8_init(AVCodecContext *avctx)
 {
     VPxContext *ctx = avctx->priv_data;
-    return vpx_init(avctx, &ctx->decoder, &vpx_codec_vp8_dx_algo);
+    return vpx_init(avctx, &ctx->decoder, vpx_codec_vp8_dx());
 }
 
 const AVCodec ff_libvpx_vp8_decoder = {
@@ -372,7 +372,7 @@ const AVCodec ff_libvpx_vp8_decoder = {
 static av_cold int vp9_init(AVCodecContext *avctx)
 {
     VPxContext *ctx = avctx->priv_data;
-    return vpx_init(avctx, &ctx->decoder, &vpx_codec_vp9_dx_algo);
+    return vpx_init(avctx, &ctx->decoder, vpx_codec_vp9_dx());
 }
 
 AVCodec ff_libvpx_vp9_decoder = {



More information about the ffmpeg-cvslog mailing list