From patchwork Tue Apr 21 02:31:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19119 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 E728944AB6E for ; Tue, 21 Apr 2020 05:32:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C472B68B981; Tue, 21 Apr 2020 05:32:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 071C568B979 for ; Tue, 21 Apr 2020 05:32:05 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id k11so14682917wrp.5 for ; Mon, 20 Apr 2020 19:32:05 -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:mime-version :content-transfer-encoding; bh=3EtHyqDRqf//sqJSpSGuc3IFe8RaZV5yWRpNw58AE2g=; b=eCJtTo0fMSVvctt+Jqv7PMUjScX/G8tMIpzMA2VTho4Oqrcjd03MuX2Cjv7S+b+KdS SvX/R7UoCUlERuUpfTU7j8MOhCkLr5X20daGHPDZ5xeJLlvLOz/k5OUvvHLjeeS59gb+ rebZOyWA56Nn3YSGiBAnkS24i34CNyH4MspHs6xDjmRXiyILoGHG8zJOh+Rcrie4e33U goNB2JyTn+p1Em6blZPwPLGlxIrY1OVtmlM/dMP9B0BPmdZFSk6/eh2z/jpBr8YTdI4l /1Nr463ZFpz6zAMtmkVBuXdh+B8LPEENgmCbtyqrk8C4Xdp6QLKjT8u4BgqhhNAKChRP eOlA== 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=3EtHyqDRqf//sqJSpSGuc3IFe8RaZV5yWRpNw58AE2g=; b=dRcsTDprjSaZbXHhjL94uDAbkV9122QAcP8E+nG5ITHUg3wS5Hh7d96SdBU862t2O1 OhkT8IBpXM4R6tTV8ZxJVx1FXQLhWTySvupjVrgjxSJQjDB38mXYmYbARj4r/S8tvzJF CnsLsTFS6mB00LemInJlMnjMCGA9/ikV5MDRjEskO0v6FcQZzHLu/cGygaAVx+tFVIVT Ubcte7GogN8EjvzZPjv4lNE2ynsofV/cL/1Ilz/0b4WY0OQ6ftBJifrPPgUXl/H7HsTw rcet4c6yo+3suQ5ybdKN9Ly5tNBvqx1AIbPcorHgH4897SOJSgpgdsf3nFetgXrDaoRz qrmQ== X-Gm-Message-State: AGi0PuarIohPZg5yvsMwnYRFk+7jcqbnS0Vxg7ajsL4Qvjemdql6DKgT mDpXKsar918mvydWOm3wfXXgsGt5 X-Google-Smtp-Source: APiQypLJXnPuamVpu/6g5KbD/enbI5pXfDeQpFpUYcnvuBj27xNi9riCRECKcYiTWE3u+lOFtY5A0Q== X-Received: by 2002:adf:f98e:: with SMTP id f14mr21479277wrr.253.1587436325165; Mon, 20 Apr 2020 19:32:05 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id m14sm1708656wrs.76.2020.04.20.19.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 19:32:04 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Apr 2020 04:31:46 +0200 Message-Id: <20200421023153.25008-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8] avformat/utils: Remove superfluous headers 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" stdarg.h has been included in 780d7897a9c9295b43f1f0e9b49a11f99cd402c3 for ff_url_join(). This header became unnecessary when this function was moved into a separate file in df9f22d42b0905385629a9d368bb5a1eef2b45ef. libavutil/pixdesc.h has been included for av_get_pix_fmt_name() in 603b8bc2a109978c8499b06d2556f1433306eca7 and is unused since commit 2fb7501938b7103624c9bef740ca498258cacdab that removed the stuff belonging to FF_API_FORMAT_PARAMETERS. Notice that this file still uses AV_PIX_FMT_NONE and that therefore the header libavutil/pixfmt.h has been included (this header is included in pixdesc.h as well as also in libavutil/internal.h which is also included). libavutil/time_internal.h has been included for gmtime_r() in commit e7dd97b5d8cd6ea150446591f37a5946e8ab7cfb; it is unused since commit b72a7b96f84e5f16dd93b60668aecfda99442c71 which basically moved the code making use of gmtime_r() to libavutil/dict.c to use in avpriv_dict_set_timestamp(). audiointerleave.h has been added in c26e58e32cf430f060209e0d6088181f4426b3ce because of ff_interleave_compare_dts() (at that time the muxing code was not split from utils.c yet); said function became static in commit 101e1f6ff90c3365bfde05469ae26d2ee7f71f3e, making this header redundant. metadata.h has been mostly included for what now resides in libavutil/dict.h. The stuff that now resides in metadata.h has only been used briefly: From commits ed7694d8cf4633da444237f4df7efc48936419d2 to d60a9f52eb42dc76dea9996c8ba3567ae98a9a04. riff.h has been added in 45da8124a09d0ac5f9d8174884584c5f80309d0c because riff.h once contained declarations for (ff_)codec_get_tag(). This was changed in bfe5454cd238b16e7977085f880205229103eccb. Signed-off-by: Andreas Rheinhardt --- libavformat/utils.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 2fb2309f68..a36d6738cd 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -19,7 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include "config.h" @@ -31,26 +30,22 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/parseutils.h" -#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" #include "libavutil/thread.h" #include "libavutil/time.h" -#include "libavutil/time_internal.h" #include "libavutil/timestamp.h" #include "libavcodec/bytestream.h" #include "libavcodec/internal.h" #include "libavcodec/raw.h" -#include "audiointerleave.h" #include "avformat.h" #include "avio_internal.h" #include "id3v2.h" #include "internal.h" -#include "metadata.h" #if CONFIG_NETWORK #include "network.h" #endif -#include "riff.h" #include "url.h" #include "libavutil/ffversion.h"