From patchwork Thu Dec 10 11:16:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24509 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6825644AFC6 for ; Thu, 10 Dec 2020 13:25:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B6A168A9DF; Thu, 10 Dec 2020 13:19:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62FF168A9EA for ; Thu, 10 Dec 2020 13:19:27 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id a3so4892505wmb.5 for ; Thu, 10 Dec 2020 03:19:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=I4BfSVgkYXdmvAXvARt15Du7mYJvVELKFFALuYYArXM=; b=C4BD393idru5WuTyTbu2kqaCguGwuMnZKg2cW+ZuvN4dtSswvHv/rHezuztrHzAg6f c+9IiZg3ZPK+8QZLgAdj7dDA2Enbm2jps554T0iBTAtU3E7WZxeDGR1/6MHyC7M4Lqn6 wvxwgar18y8CCF736hZm4vidH5xUapPDdWznjE/BsV6TiDmbReBX0XrrQkuqSJ64BlUZ n5eFUVQDwIPgih50qRkQ2np6xCTCt/YZlJ47rsBFRA2fsF4OIMPZsiUgTM5deoI2bxGf 7K/+9NAI50jSysFP1akwpQR2oYq0tBIJU6quq4LCUtdluNbtzEwRty/yywIxW2GcQDkw hEPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=I4BfSVgkYXdmvAXvARt15Du7mYJvVELKFFALuYYArXM=; b=sRigAjiOLHwTXJ6UQxV6xVxMlSok90Rs8qLI7ruK8IMWQNZOP3n8KSkBlKNYbHEb2I x+kU9ubov/CpVZ+MfnK/dj6DCk/jvZQU/UEgL7lM3Z9eHN6Qpu+ta1264qpR0A0fTIVX 8fsTf/niIHDNGSmchvPeJfmoyE8l/ovohZM1xU7ttIxYn2H+GuqbC1+Xc+7r3gQcircz joEZFaTys4kaduJlmVsKR7pwMgUnjIepY0mf1nK4hITMMaOKh2Qoypj1osX7ITnfFA3W 9R0k6mC0UrKSREU4Yy5+Ek1C/cWkcJ/1loDU9/bxz3FpvvMTnWNegSQexnEDcrAuRQTW /Yzw== X-Gm-Message-State: AOAM533kuiwiXBeUbsbVWPjvWkc03vhPQg4pValjTfgJIOvS182AjnN9 p6KZ1Z1vA0Cbx1bCFtb4zjIWA0Z86acaJw== X-Google-Smtp-Source: ABdhPJxBpPfFjTDIyVepgBsWkM9nTjvK1owfRVnqq9cNSgQeBbNRuY7QYJCq3H8ALmfNndaaoeU0NA== X-Received: by 2002:a1c:f617:: with SMTP id w23mr7493131wmc.52.1607599166641; Thu, 10 Dec 2020 03:19:26 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id s133sm8942330wmf.38.2020.12.10.03.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Dec 2020 03:19:26 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Dec 2020 12:16:57 +0100 Message-Id: <20201210111657.2276739-40-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> References: <20201210111657.2276739-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 39/39] configure, libavcodec/speedhq: Fix compiling SpeedHQ encoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- configure | 1 + libavcodec/speedhq.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index 90914752f1..249d7afe02 100755 --- a/configure +++ b/configure @@ -2846,6 +2846,7 @@ sonic_encoder_select="golomb rangecoder" sonic_ls_encoder_select="golomb rangecoder" sp5x_decoder_select="mjpeg_decoder" speedhq_decoder_select="mpegvideo" +speedhq_encoder_select="mpegvideoenc" srgc_decoder_deps="zlib" svq1_decoder_select="hpeldsp" svq1_encoder_select="hpeldsp me_cmp mpegvideoenc" diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index 0312ed6f0b..739e64fbc5 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -26,6 +26,7 @@ #define BITSTREAM_READER_LE +#include "config.h" #include "libavutil/attributes.h" #include "avcodec.h" @@ -140,6 +141,7 @@ RLTable ff_rl_speedhq = { speedhq_level, }; +#if CONFIG_SPEEDHQ_DECODER /* NOTE: The first element is always 16, unscaled. */ static const uint8_t unscaled_quant_matrix[64] = { 16, 16, 19, 22, 26, 27, 29, 34, @@ -654,3 +656,4 @@ AVCodec ff_speedhq_decoder = { .capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; +#endif /* CONFIG_SPEEDHQ_DECODER */