From patchwork Tue Apr 7 21:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18760 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 C4FDD44AF3F for ; Wed, 8 Apr 2020 00:46:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A24C668B6AA; Wed, 8 Apr 2020 00:46:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3B2868B5F3 for ; Wed, 8 Apr 2020 00:46:18 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id g3so5600908wrx.2 for ; Tue, 07 Apr 2020 14:46:18 -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=5hs143XpCvDSrp4iZWlw6/zLIBrRb8QOKXAnp9VWvno=; b=fYD/5sFaiQvOOzTUHit3LS8okSBWSzqPZWM0QjeWkE67XqgVa/TPSDVjbOfCpAxXVg tScDd9p+IlJ2+8qeCyBIv0E93zy4Hx1Y58wBUDBsAD4wLIsZLEfrMobxXtdzrxOAnIGW lT2nPhsdf+iNfEGPQ4XILy60t7TyL/kZFS2r5mFP7fQj9rTyJxA3bu9dQK/UVFufVwKj nDdzF++2QJOmUgtQQhaKmqRRXClb2+c3+r45gKS03kM+Fb15g1qwjuFMDZAYdzMuC33F zw86AEIXhUx8atyDKf9y8wada9PLcQodR2RRY+W6OumgiqvWZEI28Bf+BC1u+U502LbK 4ntQ== 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=5hs143XpCvDSrp4iZWlw6/zLIBrRb8QOKXAnp9VWvno=; b=tTRCjMOYAfvzK0VdT1Y2kbl+znR2M0eUw/yKv/XS2vpWcF6v8qBx3uSVA5fab2Ctiw l+97mNzTGG7a0qrhvfVIgi/uE8X/olnyJgTf5qvBViXQUX5/RdKZxaVzlX7Mf2H8KkyK gn2J7RLMeXoXNPE5Iuk//nnybvwWDAFqJR7rrz3o8jkIdq79JrIg+ccrRmIeJ1rdhu5u i2KfC0Q04UvNslHsw7IeOhoZItM05aolWeSQybVvqBrQuEvTCAuYYQW+wzxppg5K5F1j daiEisWPznP8OidVgJInvDVU4ddX/VWH0V2XORtihimhKmEk0ZvC7RXCh0IHtOSdAnK3 Royg== X-Gm-Message-State: AGi0PubUce6qIoAxaYoz6yl7MTnMDfu+e9YXfJxXNbBXuJiJt9Nyeuaj 1xg8paIS6X/RaZzEW0NPTPSvkTEq X-Google-Smtp-Source: APiQypKFIpnBiljwUFWGMgpeh52hOWG6jC3mu38GN5LgRa+W7MeDEv/XSyrnyEQ5eUD7AQo3ex2dSQ== X-Received: by 2002:a05:6000:120a:: with SMTP id e10mr5119703wrx.188.1586295977636; Tue, 07 Apr 2020 14:46:17 -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.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 14:46:16 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Apr 2020 23:45:55 +0200 Message-Id: <20200407214603.19798-1-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 02/10] configure, libavformat/Makefile: Fix webm_chunk 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 webm_chunk muxer requires the WebM muxer, yet it does not directly require anything from libavformat/matroska.c (it does not even include the corresponding header). So remove the dependency from the Makefile and add a _select to configure. Signed-off-by: Andreas Rheinhardt --- configure | 1 + libavformat/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 09bda9b408..2f08d06af7 100755 --- a/configure +++ b/configure @@ -3335,6 +3335,7 @@ w64_demuxer_select="wav_demuxer" w64_muxer_select="wav_muxer" wav_demuxer_select="riffdec" wav_muxer_select="riffenc" +webm_chunk_muxer_select="webm_muxer" webm_muxer_select="iso_media riffenc" webm_dash_manifest_demuxer_select="matroska_demuxer" wtv_demuxer_select="mpegts_demuxer riffdec" diff --git a/libavformat/Makefile b/libavformat/Makefile index 9d4c230bcf..f72fa6fb1a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -555,7 +555,7 @@ OBJS-$(CONFIG_WEBM_MUXER) += matroskaenc.o matroska.o \ wv.o vorbiscomment.o \ webmdashenc.o webm_chunk.o OBJS-$(CONFIG_WEBM_DASH_MANIFEST_MUXER) += webmdashenc.o matroska.o -OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o matroska.o +OBJS-$(CONFIG_WEBM_CHUNK_MUXER) += webm_chunk.o OBJS-$(CONFIG_WEBP_MUXER) += webpenc.o OBJS-$(CONFIG_WEBVTT_DEMUXER) += webvttdec.o subtitles.o OBJS-$(CONFIG_WEBVTT_MUXER) += webvttenc.o