From patchwork Sat Apr 17 17:31:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 26976 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c04b:0:0:0:0:0 with SMTP id c72csp1262771ybf; Sat, 17 Apr 2021 10:31:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1LHjRR3JGmSc5ZkeiohbpekJJPS+wTRWr36sAlvVDnLjebx4GPNmmGGn44v//XezFfZZT X-Received: by 2002:a17:907:628a:: with SMTP id nd10mr13964910ejc.326.1618680691050; Sat, 17 Apr 2021 10:31:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618680691; cv=none; d=google.com; s=arc-20160816; b=s/9qhBZHQaAVCxVznSWvsx8F5TVWHdpjKSlkJ8ot3p/u/yz8RjkXGGgAiGiVU0zCqy w5hU5veItDrq4apQ3ukxGy+xzSZCuLNr986josQM7EBMgKAvcoyMcwemT1S37iGftqnO dRVROhtMb4xm6DqZ1lU5Y7Kau7p29CK1W1wOKqYIM9l87XnoWvLQXIDipvpXVtZH/DUg pvkknsNqirCZixwlApU/oDVfEVbF1Vm22jNRVh5GJmPgtF651z5y6QSSFG6EC+ZV/opE N75fS9VG6N5eNAe27XzHmWmErxxHdiffhqUQr48zVisHautQcxZwQSQXWFOX0JHSX9ub pmxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=9/8Wpq6hMccns1lddT1YrDXoBvJlR5ZTNhjAjHvRfJk=; b=Aiuna2UpRH+QO8/xpRes/AwEUQUOgU7cdTYazLs5rnqQWfaZU6XlHIglBwRzKbDTsu k5mwE6aO2sW4z3ZqmLoRiQ6TzBxmMviFFM8dxWgC4e61r9lwN8fLfjVqDkMt3Ty8Qsdo qhrmf3PU1yK16j4+zEO1HyI/r9nAxmQpdftfx8i3mu2rfBtNX5PSflYgDQmb8z8LquFv fii9Sy7V0TwB81/DGlHNtKooirHsRpUXTx72m9+pcbgCsN/RxcQuSb7ysa0353Pxwo3n CEKTlpqPA28temWJa0HQEcrW4wxERVjJz5ytldcYWeQnqY7gf7SJZU004aF771jEsnQu Nnuw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i13si8380636ejk.727.2021.04.17.10.31.30; Sat, 17 Apr 2021 10:31:31 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1CB12680836; Sat, 17 Apr 2021 20:31:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ED166803A7 for ; Sat, 17 Apr 2021 20:31:22 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id C183C240476 for ; Sat, 17 Apr 2021 19:31:21 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id p4SRbDS_MCLd for ; Sat, 17 Apr 2021 19:31:21 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:30e3:de2:f293:c98a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3F04524042A for ; Sat, 17 Apr 2021 19:31:21 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 3FC083A05E4; Sat, 17 Apr 2021 19:31:19 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Apr 2021 19:31:11 +0200 Message-Id: <20210417173111.20314-1-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/libaomdec: fix build without AOM_CTRL_AOMD_GET_FRAME_FLAGS 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: mp8zbIBTwcB8 Content-Length: 2132 --- libavcodec/libaomdec.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 6de3bcc5c3..143c45b620 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -161,7 +161,6 @@ static int aom_decode(AVCodecContext *avctx, void *data, int *got_frame, AVFrame *picture = data; const void *iter = NULL; struct aom_image *img; - aom_codec_frame_flags_t av_unused flags; int ret; if (aom_codec_decode(&ctx->decoder, avpkt->data, avpkt->size, NULL) != @@ -200,15 +199,18 @@ static int aom_decode(AVCodecContext *avctx, void *data, int *got_frame, return ret; #ifdef AOM_CTRL_AOMD_GET_FRAME_FLAGS - ret = aom_codec_control(&ctx->decoder, AOMD_GET_FRAME_FLAGS, &flags); - if (ret == AOM_CODEC_OK) { - picture->key_frame = !!(flags & AOM_FRAME_IS_KEY); - if (flags & (AOM_FRAME_IS_KEY | AOM_FRAME_IS_INTRAONLY)) - picture->pict_type = AV_PICTURE_TYPE_I; - else if (flags & AOM_FRAME_IS_SWITCH) - picture->pict_type = AV_PICTURE_TYPE_SP; - else - picture->pict_type = AV_PICTURE_TYPE_P; + { + aom_codec_frame_flags_t av_unused flags; + ret = aom_codec_control(&ctx->decoder, AOMD_GET_FRAME_FLAGS, &flags); + if (ret == AOM_CODEC_OK) { + picture->key_frame = !!(flags & AOM_FRAME_IS_KEY); + if (flags & (AOM_FRAME_IS_KEY | AOM_FRAME_IS_INTRAONLY)) + picture->pict_type = AV_PICTURE_TYPE_I; + else if (flags & AOM_FRAME_IS_SWITCH) + picture->pict_type = AV_PICTURE_TYPE_SP; + else + picture->pict_type = AV_PICTURE_TYPE_P; + } } #endif