From patchwork Thu Nov 4 04:44:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Oliver X-Patchwork-Id: 31289 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp91408ioi; Wed, 3 Nov 2021 21:45:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwFgB8zYEtJQL5V3GBg+9dz0Xqh6GZrnnJAneqLKAsRvvTeR01PrrkdWuLFps2RHjZQ0VHz X-Received: by 2002:a17:907:868e:: with SMTP id qa14mr19951266ejc.564.1636001103856; Wed, 03 Nov 2021 21:45:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636001103; cv=none; d=google.com; s=arc-20160816; b=L7UxaVf9kDYfHAWyAEj+ISAY8Yy0tgC34KASIkJdT2nXpqlHELBm3xn2Vyzu1QsZMt dZBAjxIdD3+p1OAoOn9h/g60EdJ41HBXojwAteaibK2kbadJj0mQ0VE92YDzslCIo07m pyk8Qo4k+Iyxt+AjKbLy4o+rV5evgM5jBvFFJi5eCH+dSCNb60JBTBGkK+ySCriwtQuw NwXRdkjozoRsbqab0tXScVoQUtC+OpjSWonDVhRJLrG4sWP6HmtSA9t5AdVEMhOR0Lwh 4d/H2sYNQjVUyqZ2EZDw8aKbOCSiHKHEszGXktoCfIRYZrRoPmJ/lMNLhxhs4QZPqfzl MIug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=YD98N/b8+RZOx43zms41xZviWPsLWqQ5n1Rzjf5TJCM=; b=UIiP60SeEa6TxnBvAPpyCUlwAOsuvV2eMNSrB1cHPAOQ9sJqINnNXe6+9RKsijl4+9 wmZjpukHiVFgDaHCmKKGT1+a6oe+PbvTy02Eg0aodAB23/rCjkdiio99ihY+X3HG6k5H Ge0Yej4h9bnM5t5vbCzAHg4ga/fxtLRbnWXTl1RS1rFn58/CKtBAMRGoNBjJBKlKRTJn cyBwFNtDec3C+FnPOQPPWU14f1TdVf8dljnxo1Nf05TP4/csHb7KPaxTV+nY401Qf7Mb irnUfT+bazfFb+xnswHhsEEgNvD7/pxllrsrMJo5iw9xN7nFeqMRLCNMSMDE+uwjYXNW HD6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IlQHBce2; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i8si6807774ejj.491.2021.11.03.21.45.03; Wed, 03 Nov 2021 21:45:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IlQHBce2; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DE1A668ACE5; Thu, 4 Nov 2021 06:45:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7A5A68A7C5 for ; Thu, 4 Nov 2021 06:44:54 +0200 (EET) Received: by mail-ed1-f44.google.com with SMTP id m14so16513816edd.0 for ; Wed, 03 Nov 2021 21:44:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=mniuhmZ6Flh1Qittg2NhtgQ45sRuP62XpipK4U9Gdwk=; b=IlQHBce2zn492+bX9UiCtN4JwqrxM7O66dhlSnLFpao0FryvL7MSy1tBh1iA11hAlc v6bizBNR617VCWMST95u8eF/q4wDEUNLWpEWAmpkqia5eVc1oSYIVGb5byg+GAHI9hxr hgPncR2+3/51dZo+nMhg3U3Eo6Wo7oN+1Woy4xrmQUvXlqLVqKVIhCnp5GLLrFj0b+6h oR70b/OZgjB2FoDtZVrLJFkxD2lQMLX2oKKuehjwNqauZhFGKQxer64P1J4GuRrEX2tB kVlx26lUlL4OUWMm6dfS+d4M57MYMFomyWDRmrdJc4MkraI33Vknk4F0/9fv1gAjh8By XskA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=mniuhmZ6Flh1Qittg2NhtgQ45sRuP62XpipK4U9Gdwk=; b=KQBn9J9hr9WThWOxgR7EyFn1pwZTLTD16O7XMfODpktr5IVgxdgCRQy4GlRFb5fX3Z F3C52UJ/xJhUQErFoDkl03gjh6zDwfitrBdgqp2Yfh4fVCjKIg/KMqjOwv016tQuCTKQ 1g9h66vIawra6yhpUTDBYBfuWJYZ0x4Cjkh/MsfIyoAd735DlYMI5ivkKGYHMkDH2o0t f1HzmYqTvuNWQLHVmQiFcjdw40WuONMZJdWgIf6IVFkUsMst5LR6tY0fYd/WnwZyDF6i zLU/AxQ7eOnSEEK6vz+BIyZP1zmJ8s/vT23OuAOuxOhBJKGPvGsqbuolKM8RdyLyVlFM cMPw== X-Gm-Message-State: AOAM532oXG2awFrsIq9QSSOiZwG+h0sN6njLnFJoUDl3GnySbvh5BcTv w6MLXcFOwKO2Tf3mw3BUUYpoCsHwWK2rTjNZUN3U7mQnXtE= X-Received: by 2002:a17:906:90da:: with SMTP id v26mr9913263ejw.442.1636001093756; Wed, 03 Nov 2021 21:44:53 -0700 (PDT) MIME-Version: 1.0 From: Matt Oliver Date: Thu, 4 Nov 2021 15:44:42 +1100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] libvpxdec: Correct linking against variables. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NLIaA3Aiaq2F Instead link against the function that returns the correct variable. This fixes linking errors with dlls with msvc. --- libavcodec/libvpxdec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 = { -- 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 );