From patchwork Tue Feb 23 11:37:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25918 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 B30D344A632 for ; Tue, 23 Feb 2021 13:37:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8198A68AAC1; Tue, 23 Feb 2021 13:37:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A72CE680972 for ; Tue, 23 Feb 2021 13:37:20 +0200 (EET) Received: by mail-wm1-f42.google.com with SMTP id v62so2116900wmg.4 for ; Tue, 23 Feb 2021 03:37:20 -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:mime-version :content-transfer-encoding; bh=BO4Hx72PaGhs4X7zgZemJUDyOoXsGerdAzzNosolJq0=; b=XN5EBcQ5l88MqqpMybj2Mtf11iEM3ATxyHXDVI15njxc8acvBKTufB0J6ZxomQni2I 8YkPMFA764IDjNGGvsiMbLVj0QjQisGw9LMixAdQ88dOKhhMdlyw+VP25jvtfDLTD+pA 4YBDctIzHnsqCLSR0QfmelShd1BocXI8oeCF6zNZM7P3z2ut9ddNp6nXXnFSEzNdxj5f M8z6KpID3rF39RuppIYq1+PPyx+vHk+Oku9ttIVXaEQIkv0JrLk3CTTGejRI2iCsdqUs UyZHWp9uZJc9CQRRj6eFouS343D1YTa3Nbda0Fsxqqdn/kKvE+GEPAPBeLPhRNaXVnLm J8IQ== 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:mime-version :content-transfer-encoding; bh=BO4Hx72PaGhs4X7zgZemJUDyOoXsGerdAzzNosolJq0=; b=ny0hgwHSrFhHR0PbBvEufALn5VACss1LuK2uREw441tVMF6TkQgy13XENu5qOig+eS 76ZNKXMtaItwgyPOj2fbMhLnJ2fwsB41O96FBrYm41OOW/+ogVnl3Wk5dfLlvaoTz0WF FlUoqbB1M2XPmVQ7Pbqpuopmj2U/OrUpmmkAZIfGKCkhxg+cZTCQoXWWE25BKRP+ew5I JGb33DjHfscTFH85QgYYKb3oiX1xY9bSWqyaSUZCS3uuy5hn499c6Z3rN7XWRhQWg3OF BNPz3h9RlWxd/+FWU/xp9dveGWO1oD2T6LqXZv8YOS6fxvwsbAtFPbtz1sXJd/gdPAmG iReg== X-Gm-Message-State: AOAM532yPYWkMyDFGNsCGH/ESMaUxeHwzb+tS5KuFza3L9OZ4L8BaleB 5HARHd0s5a0FdBEoH3IRE5vv1yBVKhU= X-Google-Smtp-Source: ABdhPJx5In2jHAQ3lusaug7wDH6iFeeohpQweHCta3/q0cXHPvk69k5yRQoivm7IdfleR0he2vKwHw== X-Received: by 2002:a7b:c755:: with SMTP id w21mr17625833wmk.81.1614080239893; Tue, 23 Feb 2021 03:37:19 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z11sm13057510wrm.72.2021.02.23.03.37.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Feb 2021 03:37:19 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Feb 2021 12:37:11 +0100 Message-Id: <20210223113711.439788-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/Makefile: Remove unnecessary dependencies on vocdec 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" Commit 0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364 factored the main part of the voc demuxer's read_packet function out; yet when this Libav commit was merged in f99195d56f4aab266926724ca1cfae822df4df16, the dependency of the other users of this function on vocdec.o was unnecessarily kept. This commit fixes this. While just at it, also disable the data only used by the voc demuxer and muxer in voc.c if both of them are disabled. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 4 ++-- libavformat/voc.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 4b15830659..56fa96ea7f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -122,7 +122,7 @@ OBJS-$(CONFIG_AVI_DEMUXER) += avidec.o isom_tags.o OBJS-$(CONFIG_AVI_MUXER) += avienc.o mpegtsenc.o avlanguage.o rawutils.o OBJS-$(CONFIG_AVM2_MUXER) += swfenc.o swf.o OBJS-$(CONFIG_AVR_DEMUXER) += avr.o pcm.o -OBJS-$(CONFIG_AVS_DEMUXER) += avs.o voc_packet.o vocdec.o voc.o +OBJS-$(CONFIG_AVS_DEMUXER) += avs.o voc_packet.o voc.o OBJS-$(CONFIG_AVS2_DEMUXER) += avs2dec.o rawdec.o OBJS-$(CONFIG_AVS2_MUXER) += rawenc.o OBJS-$(CONFIG_AVS3_DEMUXER) += avs3dec.o rawdec.o @@ -137,7 +137,7 @@ OBJS-$(CONFIG_BMV_DEMUXER) += bmv.o OBJS-$(CONFIG_BOA_DEMUXER) += boadec.o OBJS-$(CONFIG_BFSTM_DEMUXER) += brstm.o OBJS-$(CONFIG_BRSTM_DEMUXER) += brstm.o -OBJS-$(CONFIG_C93_DEMUXER) += c93.o voc_packet.o vocdec.o voc.o +OBJS-$(CONFIG_C93_DEMUXER) += c93.o voc_packet.o voc.o OBJS-$(CONFIG_CAF_DEMUXER) += cafdec.o caf.o mov_chan.o mov_esds.o OBJS-$(CONFIG_CAF_MUXER) += cafenc.o caf.o riff.o OBJS-$(CONFIG_CAVSVIDEO_DEMUXER) += cavsvideodec.o rawdec.o diff --git a/libavformat/voc.c b/libavformat/voc.c index e4cdf8bf49..04ec0da9ba 100644 --- a/libavformat/voc.c +++ b/libavformat/voc.c @@ -19,10 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "voc.h" #include "internal.h" -const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A"; const AVCodecTag ff_voc_codec_tags[] = { {AV_CODEC_ID_PCM_U8, 0x00}, @@ -36,4 +36,7 @@ const AVCodecTag ff_voc_codec_tags[] = { {AV_CODEC_ID_NONE, 0}, }; +#if CONFIG_VOC_DEMUXER || CONFIG_VOC_MUXER +const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A"; const AVCodecTag *const ff_voc_codec_tags_list[] = { ff_voc_codec_tags, NULL }; +#endif