From patchwork Wed Oct 20 16:52:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Oliver X-Patchwork-Id: 31175 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp1689541ioa; Wed, 20 Oct 2021 09:59:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxWgiRwkgoaWV9WKfx2nIioWhZrkabUmx7YdSy8KDvVq+yiVW+BLO0CfR2nVIpWjJKVTtij X-Received: by 2002:a50:da42:: with SMTP id a2mr105977edk.361.1634749196007; Wed, 20 Oct 2021 09:59:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634749196; cv=none; d=google.com; s=arc-20160816; b=cdpgRCIpaOKeMyrN/BmRALibSPV9QTH41nL2FOLkj5NxZN0y/J1+f6Fo8yfH3oIbSv PUNohKNZQ+uxHhNadRX9DZchO3Yv4DtdqAJp3d7Z7nBiMXjbvJyNcV1e7thHOAekb+kc szUoyrhosV6IPGEl/bL98DbakUQd2UvmkPiIF5JCup0yv5P+opEY1wH9Z80LlMHgnrtn wGK9Q4M3OlvtC3JVjnxiyomRd/6OZ4X6mYVtT7qXjnK2zbBM6cdCvyZv+V0eDRiRjWBC UcJWwMB0HkhaPZnR4tTJItGYI/0r0uMa2e/OzpMKLVnARjrcDIsmRB9xvZ2EqKcFo6gO 1kMg== 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=tugASBMx+tdeV1geJB/kGdX8ucjksnUUe3yWOCxEdUE=; b=WrK+n+FXQwc9Di8v3yf/EqQDT6UxxAzjvJkcBHonAJw0KyUg68y+g6ssr2hZ/IaE/n qjiMaIvPKtERjPJ0NJ8ovgSTHaTcAxavtzhpBaAyyM+ySBrZhJjbbYAxiBkeiYjQJhDx SgVzZaA91YBTMRkzyKvjgKto13Qxve9cgOnqJfP8E0GJNOBLwMDJgmq4TJcMcqrPAKty Zzu0/XyGMRU7W9uOdfhR1uLgbY3fpwo6eE2bx/mkpuVxWrPBkzIlb6gffxLm7XH0XPFQ lm7J+L1NBcg5/b2TYDLi04BquSolbaMBNKr6FzOk3lLVwynk2DlTHtvGi2H0mSQlbF0v qk3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=FMCU6yMf; 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 bc27si3412974edb.455.2021.10.20.09.59.55; Wed, 20 Oct 2021 09:59:55 -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=FMCU6yMf; 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 C4FCA68A946; Wed, 20 Oct 2021 19:59:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C64968A827 for ; Wed, 20 Oct 2021 19:59:46 +0300 (EEST) Received: by mail-lj1-f176.google.com with SMTP id q16so13746468ljg.3 for ; Wed, 20 Oct 2021 09:59:46 -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=X9hFXPcMy4dLKvC7O53MTgblHT1FARmKRlVcwZbMqy0=; b=FMCU6yMf4d0YD3TngiJbC6HeVT2ZF7OCzap2aaFYVh5Bm6E6a8Fpla1ww6r9rs+EM/ FFkzkEtZ7r13bJsQX5nxSOrDhN1RikXRpiFLERiI6zfCCCdq/ZqXZx3mFtGP0EeoTDJM q6v0EshGmxSXzXnPcslXZxGMvp1R45XHqtG0dIhntg1ezawqJGUyf9uP52H7TmHb/yZA wP1mbbOrCU0B+axlqvPmMWsSN18KpttKBcXGjHdbZWUvVhx5DWhd3vOh4uWF+93/fgqI cM5VQymrNR5szVOxbUgk9k5ksK4YFytSsufd6Sg1NF/HumgAAWy7TXboikVpm9mGOXiH tyJg== 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=X9hFXPcMy4dLKvC7O53MTgblHT1FARmKRlVcwZbMqy0=; b=GGiA3VtjhbJE4d+roiI/5Fk5zRvuirCIM3c0+FsurDeaYhMSMWreZAiV0CIGENkein YplaFq2EKvoZue3/yP2I6HsVGnkqeoaOYRSWRHJt8bOF6nhzeHh6gcASGG/fxPYtw8Op PajZsQrvMuPsQeCNOwF5wRnOwVahDDaM0iRLB8s6fZi9r/u2UcdOKFWbHYC34c5CW8HT CGIWS053lR/C0R7qqldnox2X7X2pv8dzN6yPfAb6nwccyDESs5m/bLJm4f5JZuhx0ThF ZAqcOGIXgkYv6q8CoSaKFPu/t7gJOx7cX7YfIY6XE0WuU944aZyI5lVGSlZp/QQSJfTw mDtA== X-Gm-Message-State: AOAM532Vjoa88gbsw1/MzXsMLQ0D5wm3EsO9uBFKK+vcgD3Ia+F0/DCP tVDyYKwsXAo+Ltrc31+QIVbEAyZkUJ8fGJ/oxj6azSFCXSU= X-Received: by 2002:a05:6402:84d:: with SMTP id b13mr196593edz.6.1634748786457; Wed, 20 Oct 2021 09:53:06 -0700 (PDT) MIME-Version: 1.0 From: Matt Oliver Date: Thu, 21 Oct 2021 03:52:55 +1100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] libaom: Dont use aom_codec_av1_dx_algo. 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: LZl6QPK/1VMC This fixes linking errors where variables cannot be correctly linked in from an external shared library such as with msvc (requires dllimport which is not used by libaom). Instead just call the function that returns the same variable. --- libavcodec/libaomdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 75ecc08970..d6b822fda2 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -241,7 +241,7 @@ static av_cold int aom_free(AVCodecContext *avctx) static av_cold int av1_init(AVCodecContext *avctx) { - return aom_init(avctx, &aom_codec_av1_dx_algo); + return aom_init(avctx, aom_codec_av1_dx()); } const AVCodec ff_libaom_av1_decoder = {