From patchwork Tue Apr 7 21:45:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18767 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 DC00744AF3F for ; Wed, 8 Apr 2020 00:46:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BFDC868B6DA; Wed, 8 Apr 2020 00:46:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28FA068B6D0 for ; Wed, 8 Apr 2020 00:46:23 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id v5so5521234wrp.12 for ; Tue, 07 Apr 2020 14:46:23 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=ATgsfRlen7Eo6ukCHIXIBeI9ME80dd1oTtaOx/wLXk4=; b=dsVNs0hTKPLRjMaRnfCJfoqKBarDmLl0uIiVhHtNvOXCJhxquek642F1BJ+BfUz8ti 5F24zoESiCYpGXrArH+x3FRLEXMQ5dJINX7Z4yppO1Ogivq4eRDygsceeO21K8W7aYFl 5inde4/1hzOZCYnUuQYVLmA9XhyLOHvNI6JX1SYRzwR5ZHEbiK22Y+O0rYDrGkAFvsKY bK9fHxBpkW+NK5v65JALBl+/NPKZsnOvwnu+iwoxbpj9AfwuYRq3zX4zhb/mzKFcaPMl 3HoPD6HVaFXYYzaxehRuthgI4jQNNYlpOKWB/LKzqk3dTvRa18elnlmQhrzVlRSyyacW fjcw== 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:mime-version:content-transfer-encoding; bh=ATgsfRlen7Eo6ukCHIXIBeI9ME80dd1oTtaOx/wLXk4=; b=F+MSi4xGMb4juu32LsIVlWVhCTlzn5mZPNtSH9CbqHqA2lTTykzXoyHosRNHO6M5G4 hOVDItHcnOsB6sMQPLRdLzbx5tgqqf1SYbC+ieRjA2Fm/EtibQxJDf0Q54uxo2rHyoel rMiZjtXpSmVi7xacIcYQk61rLb2EWn0chFWJ0vucTuuvC7LDsmpr1e+jlCuKFEBfJWiN 2Zjl80kYmZjX0lYX3raT3R/hY88RIXiYRxqhWFrX1YbeV3AI6mLLAXSdqKYmPC6k2VVb PPUIS9Ffyo4ad0wAA+QxlZ0CSnNpw8P+C8VFG1oX3vm1PIa6YQs6RoC6SfBPY+1OcuHX peww== X-Gm-Message-State: AGi0PuZan/MSUCJktd/dBjNKhb1ZVXGAWY6zQ6NoifdcjH7gfqi8DJw7 IeCfZZn007AU0flSsfU436IVsVL0 X-Google-Smtp-Source: APiQypI7xct5pXaK+ufEZTU/dTJENK/guy/TlYfNbPHYuYl0bCZsRswEg1KIw72Texo4KR51NrCGFg== X-Received: by 2002:a5d:6104:: with SMTP id v4mr5195557wrt.213.1586295982106; Tue, 07 Apr 2020 14:46:22 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id c6sm7484789wrm.0.2020.04.07.14.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:21 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:45:59 +0200 Message-Id: <20200407214603.19798-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> References: <20200407171950.19086-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/10] avformat/Makefile: Remove false dependencies of WebM and Matroska muxer 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" These muxers don't depend on the WebM Chunk or the WebM DASH Manifest muxers. Furthermore, remove some #if checks in webm_chunk.c and webmdashenc.c. They are always true now that webm_chunk.c and webmdashenc.c are only compiled when their corresponding muxers are enabled. Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 7 +++---- libavformat/webm_chunk.c | 2 -- libavformat/webmdashenc.c | 2 -- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index b34e5bc3ce..eab8fe5c49 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -300,8 +300,8 @@ OBJS-$(CONFIG_MATROSKA_DEMUXER) += matroskadec.o matroska.o \ flac_picture.o replaygain.o OBJS-$(CONFIG_MATROSKA_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o \ - flacenc_header.o avlanguage.o vorbiscomment.o wv.o \ - webmdashenc.o webm_chunk.o + flacenc_header.o avlanguage.o \ + vorbiscomment.o wv.o OBJS-$(CONFIG_MD5_MUXER) += hashenc.o OBJS-$(CONFIG_MGSTS_DEMUXER) += mgsts.o OBJS-$(CONFIG_MICRODVD_DEMUXER) += microdvddec.o subtitles.o @@ -552,8 +552,7 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ av1.o avc.o hevc.o \ flacenc_header.o avlanguage.o \ - wv.o vorbiscomment.o \ - webmdashenc.o webm_chunk.o + wv.o vorbiscomment.o OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index f079c5c65e..1749509975 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -284,7 +284,6 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_WEBM_CHUNK_MUXER static const AVClass webm_chunk_class = { .class_name = "WebM Chunk Muxer", .item_name = av_default_item_name, @@ -307,4 +306,3 @@ AVOutputFormat ff_webm_chunk_muxer = { .deinit = webm_chunk_deinit, .priv_class = &webm_chunk_class, }; -#endif diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 401cfe52d5..465485c90c 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -559,7 +559,6 @@ static const AVOption options[] = { { NULL }, }; -#if CONFIG_WEBM_DASH_MANIFEST_MUXER static const AVClass webm_dash_class = { .class_name = "WebM DASH Manifest muxer", .item_name = av_default_item_name, @@ -577,4 +576,3 @@ AVOutputFormat ff_webm_dash_manifest_muxer = { .write_packet = webm_dash_manifest_write_packet, .priv_class = &webm_dash_class, }; -#endif