From patchwork Fri Jan 8 03:52:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24838 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 95F8144B505 for ; Fri, 8 Jan 2021 06:00:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82ED4689D59; Fri, 8 Jan 2021 06:00:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14D09688078 for ; Fri, 8 Jan 2021 06:00:40 +0200 (EET) Received: by mail-wm1-f54.google.com with SMTP id v14so6758346wml.1 for ; Thu, 07 Jan 2021 20:00:40 -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=b+9CvSUDsnLV3kqHtZqUIY3fItKt7dkBBNRe+Fx9t30=; b=GyAfHjsV5PPoFPDayE/+8a/Z68pnZoXnH2XGiwE0Dp1KkO6gTcdVoIjPWKg1/EDnIv xGqSsiJKNDUFqj+7c78OM5dll+hBY8cUStZRpPGDjdQ1XuzZJhNUeoVXu4DrvQbmzlzO C49X8f11nNBAfz/pLBbW4stegUcjOgmGWJS5s65uxhPEIRZBHTaxFP+Rc8yzOpRKU5An BUAOuUsfqTrwLTaAgOvsjSk8drAbvcVIl+fdXBjE4+AuMvHX5F/aq+OQGTjoNssV1sL1 1ubVkN7DigxedHLcgMe5bLvFrcfhzV29TN30NhxqENtIOgIAuIKemJU/+WwX+s6bANDw VB2A== 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=b+9CvSUDsnLV3kqHtZqUIY3fItKt7dkBBNRe+Fx9t30=; b=TgAu+de11iAGHl9LoLR6X7prxbLKU43BTcAfGYXVsj8U6Waphx4eB9Y2IUueIQ3j8M mHwiaLxniXvTXlqoq9NgLcVgVAO7moFSNStZbwFIRoudCKlrjtELeHDQKo2gfm3Agl7a 8gA8iRgCbXDCIbhD/G+2QCsFzwoa1WsjfzT7vdbTJCpPcHc9Sh5Vy1mF268Srhj9/VOm jgLzkZHc1JYby2kiTHcwN6vuavwh04kUgkZt9R5LD7gU+AcQeW8QcJ2/qkNpONP0B6WF xIltjFvpuUrdim/0HUVSAd7CLK32o51Q9sdkpXEmGn/MYzfX5gjppeUzoFrtPcZTItV+ vxmg== X-Gm-Message-State: AOAM53197qFC0m6kYGNPqhuoXREyVEi6d/r/IFu2DTt4NLF/bgTfzB09 rmYxOB+1vCuw24R/i5lkMmZlxH0GbPo= X-Google-Smtp-Source: ABdhPJzYMfMezzSVWW5F6bZ7/Y5lTfHIbha12MW/cW659DBes8cUWZvNjkbXGPOuHxEYKGzHXbaY3A== X-Received: by 2002:a1c:c287:: with SMTP id s129mr1248383wmf.79.1610078439432; Thu, 07 Jan 2021 20:00:39 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id c190sm10048459wme.19.2021.01.07.20.00.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jan 2021 20:00:38 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 8 Jan 2021 04:52:04 +0100 Message-Id: <20210108035206.3261795-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210108035206.3261795-1-andreas.rheinhardt@gmail.com> References: <20210108035206.3261795-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/Makefile: Remove FLAC dependencies on vorbis_data 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" 2ef2496cd19eb833f4ad22a5051c11be80d09598 used ff_vorbis_channel_layouts in flac.c, but added a dependency to the FLAC decoder only; lateron aba0278e9fe8e66c078588efe66f6af4db432770 added the dependency of the FLAC parser and encoder on vorbis_data.o. Yet when the original commit was reverted in aba0278e9fe8e66c078588efe66f6af4db432770, the two other dependencies were not removed. This commit fixes this. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a711eeeb81..4c1044a281 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -330,7 +330,7 @@ OBJS-$(CONFIG_FIC_DECODER) += fic.o OBJS-$(CONFIG_FITS_DECODER) += fitsdec.o fits.o OBJS-$(CONFIG_FITS_ENCODER) += fitsenc.o OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o -OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o vorbis_data.o +OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o OBJS-$(CONFIG_FLASHSV_ENCODER) += flashsvenc.o OBJS-$(CONFIG_FLASHSV2_ENCODER) += flashsv2enc.o @@ -1090,8 +1090,7 @@ OBJS-$(CONFIG_DVAUDIO_PARSER) += dvaudio_parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o OBJS-$(CONFIG_DVD_NAV_PARSER) += dvd_nav_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o -OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o \ - vorbis_data.o +OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o OBJS-$(CONFIG_G723_1_PARSER) += g723_1_parser.o OBJS-$(CONFIG_G729_PARSER) += g729_parser.o OBJS-$(CONFIG_GIF_PARSER) += gif_parser.o