From patchwork Thu Feb 18 03:41:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25730 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 1353844BC26 for ; Thu, 18 Feb 2021 05:42:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9C60689E91; Thu, 18 Feb 2021 05:42:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C2F26891F1 for ; Thu, 18 Feb 2021 05:42:47 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id v62so1615804wmg.4 for ; Wed, 17 Feb 2021 19:42:47 -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=hA+0vFPcEErc1XxnW20j/3NHPJfRHAd7w8wmNqLynQg=; b=P8FWPYBDE0anZlep8e+b/RB4d3wZX2haOdYA4hVdvVvwpRHKOAnW0Bkl3PzgT3K2QT Uk+GxiBPfdX9Hga3upZWXBJCACYbdt2ueFRnGt9VbL83/dztF98cmb9/bOxTCkGHT5Ac 9A3LRW0ATvL45mWj9ZSllryL0ibeDW9tKiCB1AU9x0BajBhBxX9apiuVqknmO2z5r9s8 qVBtVjJEeZ/+/ru5UUI713MuUiWiSGk6JsncankjZPLy1dq8+Av5ET9qneGHN3mLLV9r 4HVCSA0LeHUi268U0/xqr8+5xeXCipfSl5qjsfCBw8g+/Xpy1ex+l+XMflrEnv62//im B+fA== 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=hA+0vFPcEErc1XxnW20j/3NHPJfRHAd7w8wmNqLynQg=; b=UlOQCUw8X5v07XvBzGPTo78+jgveG1nXd2figO4UQEdIfpRZr3brrlB+KjKHcsZw7C KOxPKMBVlTsd/lej8v1d+5ijjrbTK8iK4wbtXk3PX3TyjG1W9zix4SKuv5G+ow6qnzyh Y+L4QUW3jeAalVQZ39LTKh5wrwpRQIcW+HgBMisx24QbrsR4m9DxY5dl4tl+NxYmmstC NBqN1KMFSa568wlf6HiA6wlVm2sc1J4S/VpkG0C5P6CSaD2VlXId3VFxKm3Y6qWbNd1R jKvPJtzDp6q7R4cSjlaFKxsnfm5a43YJ6xuGtIs23a4s5smrsd2195NBzSat5YEJ6CVU 9bUQ== X-Gm-Message-State: AOAM533m0OMS3Ft9ZbBDj0+TdXlTLK+6irLhTE6axp/MWEJCCde1PMXK icPnBNmKnsMFhWRNEF2BaGDn0SqUpUQ= X-Google-Smtp-Source: ABdhPJwIJRjozgQv8B6esWBkULfBbgDs0XUMO3iO127V48b9Iy/NkWSZqOFC7c2dc1irCppbShYxMA== X-Received: by 2002:a1c:720d:: with SMTP id n13mr1592604wmc.103.1613619766425; Wed, 17 Feb 2021 19:42:46 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id p9sm5643855wmc.1.2021.02.17.19.42.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 19:42:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Feb 2021 04:41:49 +0100 Message-Id: <20210218034214.2090223-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> References: <20210218034214.2090223-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/29] configure, libavcodec/Makefile: Fix avrn dependencies 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" The avrn decoder actually only needs one thing: The MJPEG decoder. Instead the Makefile made it compile mjpegdec and configure required some of the prerequisites of the MJPEG decoder (exif and jpegtables). Even if all the prerequisites of the MJPEG decoder were required, it would still not make the MJPEG decoder usable, because for that the MJPEG decoder needs to be in the list of codecs in codec_list.c. Signed-off-by: Andreas Rheinhardt --- The avrn decoder like several other decoders uses avcodec_find_decoder to get the MJPEG decoder; is there actually a reason not to just use avcodec_alloc_context3(&ff_mjpeg_decoder)? configure | 2 +- libavcodec/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c28a7403db..21139b9170 100755 --- a/configure +++ b/configure @@ -2688,7 +2688,7 @@ atrac3p_decoder_select="mdct sinewin" atrac3pal_decoder_select="mdct sinewin" atrac9_decoder_select="mdct" av1_decoder_select="cbs_av1" -avrn_decoder_select="exif jpegtables" +avrn_decoder_select="mjpeg_decoder" bink_decoder_select="blockdsp hpeldsp" binkaudio_dct_decoder_select="mdct rdft dct sinewin wma_freqs" binkaudio_rdft_decoder_select="mdct rdft sinewin wma_freqs" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 92a3dcf0fc..4125355e37 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -231,7 +231,7 @@ OBJS-$(CONFIG_AURA_DECODER) += cyuv.o OBJS-$(CONFIG_AURA2_DECODER) += aura.o OBJS-$(CONFIG_AV1_DECODER) += av1dec.o OBJS-$(CONFIG_AV1_CUVID_DECODER) += cuviddec.o -OBJS-$(CONFIG_AVRN_DECODER) += avrndec.o mjpegdec.o +OBJS-$(CONFIG_AVRN_DECODER) += avrndec.o OBJS-$(CONFIG_AVRP_DECODER) += r210dec.o OBJS-$(CONFIG_AVRP_ENCODER) += r210enc.o OBJS-$(CONFIG_AVS_DECODER) += avs.o