From patchwork Thu Feb 18 03:41:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25760 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:6d42:0:0:0:0:0 with SMTP id i63csp2517991ybc; Wed, 17 Feb 2021 19:44:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJw00VorEWKpvBOWyoFpbj0cDpR7FLzqr1BVr0EKjQjyLSjGlYyClzC4Flq6Rx0DqOLsDwIm X-Received: by 2002:aa7:c686:: with SMTP id n6mr2028038edq.238.1613619877757; Wed, 17 Feb 2021 19:44:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613619877; cv=none; d=google.com; s=arc-20160816; b=l0XUESMZJeRF6/4s/5T5mWgbdI3HCF2p5bIJMsCfFW21oyfguPY/O/zTFwjqMRMOmK e7PpcOfIdc3YvynFldUTYtLXpLECkKVYNMVPgMRWE7fHzs/Dypq9+nnD4dBLYquWvfeG +e3cfzxVfsntwlYrtEwM3TsSsetBMR+uAu2ymxkrkr/mproMJQMWQZBM8cia52tI/Wt8 YMSTQYiE5aP0HpvhnzwKh/lo5rdxucS7yKNzvcA2bNhSt0BEsxGp+C+wGa+LnkSSNZW9 BOnf8t+mPd7zjtdRqNHJXIgm+n/bNhBFQrQ0l1ZyYjVXjOgKya3Kw6GM5qDcL7p/Ow0Y IG+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=LAF2cBvN7WkhFD3NaPRYTGwDpzGJ7bQH4GycnepvFlo=; b=IZUrMbnW+KTOuplCTr0OOvdqT48csggL9zQtzgY/XYRyokmBmYJ2qxz0HSvdyCY0ai r1dAzEYQj0FU2+zjF/b2t5OcKagFcrN6FF5XLgEgR2C6duSEKK3dL2cWpzIpqHunCo/4 bkHaYMYCmUBfIQ0bENflc8Claul1sl9tRDqXQO5ykTVdlYk9oWe9wayG7cDF+4+nbJ9Y ShUByGnhngUCjjd5WQ//X96CrvAJR+sErd1a4nTkic2R5uonvaUmM9kKg4aZga4WbK0K +v7tlYo519ZysZeAbDQ+3d6g8GpCooF+D+ymggvK3W7ReqTlE2FQj03NaVEdfHzT08IU sL1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QExBOZ0R; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w21si2396972edd.421.2021.02.17.19.44.37; Wed, 17 Feb 2021 19:44:37 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QExBOZ0R; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BF5868A3DF; Thu, 18 Feb 2021 05:43:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADC3D689E51 for ; Thu, 18 Feb 2021 05:42:54 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id t15so1089216wrx.13 for ; Wed, 17 Feb 2021 19:42:54 -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=g1m2dhoqVEz/YhCkuLjQZyv2JBOPtBmdFWeedNVDbmI=; b=QExBOZ0R74T/npG+fZKPdsBHUUkJFTcAGHm4cupgzn2dFcC2V+lFMt4WajbfjS5teW AWXkQgdNKfieHJeYM5hEboBPkeGUvoxYeoIHmcVzr7V8vR4rpbKcnEOy/YinUZvtMsc8 kt3rsQFoW3PBsXJMcypM9x3moLyTG39Re27Q0y2r5Zq/R3uG5gUmG7m0VmnL3bWyj4Cr DDaxrOxuo3V6r35EvaA89+xNK88qsB1Erb28ImT7E6ofooF+pOXVm0zAmTbYara8GEkz vnl2UEwP5wcjgiBZ2Fca9aLh60CDRuVKtkaa56Zj5YWpEIZhD5eeTvV1eU/un8fL5ngs yxrw== 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=g1m2dhoqVEz/YhCkuLjQZyv2JBOPtBmdFWeedNVDbmI=; b=YdFWtpG0PChAkVI5VuZDIS9HjDWIb5pDOdWQwmkAx2RcK/nkcmi4VUtItQ3/mbuFyG WHHb7VZyOQCJvVMPCtXKV1x+Mqj+XzHve93zraEw5dsbtS9AqHATTI4R5XcLK//VoHSe S+mjYtgzB1W9fgfsJDi84+6J3jPEAGexedig6IFrG06FmpZ+eQV7KBGiCYGEblthj1Mx Gyr/R/hzYTH3QYbU5oKJ7YCowVoPVgv1WxitD+LKnA31ceSz2xBdhC9uAVe8JICCXpM/ 9+kq+QfeJKudgVNdnN+XuXeTyT5o0ovpyBgDaF3zBxwK/rBx1lnwXZAOTzOyVmRm+hVF 26cg== X-Gm-Message-State: AOAM531pdL9gkODArnplfdsj4pFlDjCQ4FxHHZeqzWf8z+k7H7it/gvQ uhBWFl5PrXl4+o5XOF0mbP7yH2y0oTg= X-Received: by 2002:adf:f543:: with SMTP id j3mr2141280wrp.203.1613619773919; Wed, 17 Feb 2021 19:42:53 -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.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 19:42:53 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Feb 2021 04:41:59 +0100 Message-Id: <20210218034214.2090223-14-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 14/29] avformat/Makefile: Remove outdated AIFF demuxer dependency on iso_media 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" X-TUID: YulnaYErvPfY Content-Length: 2837 This is a result of the mov channel parsing stuff being factored out of mov.c twice: Once in 91b782720fd0df5571775b6591bc41797d6ecf78 to isom.c and later in 3bab7cd12802dc5abf2c5cc6dec49e9e249ce204. Also remove the isom.h header; and while just at it, remove an unused mathematics.h inclusion. (isom.c actually depends upon mpeg4audio from libavcodec for avpriv_mpeg4audio_get_config2 and avpriv_mpa_freq_tab; yet there is no configure dependency for iso_media which leads to failure of shared builds.) Signed-off-by: Andreas Rheinhardt --- libavformat/Makefile | 2 +- libavformat/aiffdec.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 10fee749c8..851d2f13ee 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -81,7 +81,7 @@ OBJS-$(CONFIG_ADX_DEMUXER) += adxdec.o OBJS-$(CONFIG_ADX_MUXER) += rawenc.o OBJS-$(CONFIG_AEA_DEMUXER) += aea.o pcm.o OBJS-$(CONFIG_AFC_DEMUXER) += afc.o -OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \ +OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o \ mov_chan.o replaygain.o OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 4d1c9bbb53..81189316ff 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -20,13 +20,11 @@ */ #include "libavutil/intreadwrite.h" -#include "libavutil/mathematics.h" #include "libavutil/dict.h" #include "avformat.h" #include "internal.h" #include "pcm.h" #include "aiff.h" -#include "isom.h" #include "id3v2.h" #include "mov_chan.h" #include "replaygain.h"