From patchwork Sat Mar 25 19:15:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40831 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp226052pzh; Sat, 25 Mar 2023 12:18:00 -0700 (PDT) X-Google-Smtp-Source: AKy350bm84JFV7UfQpzu/8XKa0aNzm+avB8DZINTs931gamtYdm0d7KPLiTgybgejhn+efKRUEMj X-Received: by 2002:a17:906:5785:b0:93d:1c2b:bd23 with SMTP id k5-20020a170906578500b0093d1c2bbd23mr8224936ejq.39.1679771880094; Sat, 25 Mar 2023 12:18:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679771880; cv=none; d=google.com; s=arc-20160816; b=QMlnNHjF+qN2tXqoCaRbsJq+gMeTAYEnEXgFy+NA9S5fd8sUM/8p+SiohkT7DHW0sE LhF4F1QkTqCZFXj5TJTH9NCCacEgySX/Q5qRwP/6szULPV/R201RSY1ZNXcZTo1GmdDV WmcZr66fyDbE7yaAug58g+3ycycZ9EBp+65J7eAbovYQvqF+rAHkEkP1XKAZm9AeiGn9 kUN0+cjMIkzudpFGU6OxBd8BEWKYFvIFrYJWPKDYEoHMWvP5gyxbn4xQbcAkOVxuVt4H D+k9dC4WWpu2xrZ7b7wAoJDWTI86tFqgmNe1NlJrTTU1MEI/2kRvl7ebgRmDL4EAsmmV 5G0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=cYLvfIQggg4fkfroXZwfWT+1W7P0Xel8RQuaM+weQgQ=; b=H5MEnn9BpfEp8lmETOmeO3Qyakmm8ZU9+ZNT6rFmm59P1j/liogQMNLvDaUX9Um4jG J6md3jSDv6UjK3fuyWo8RQlVeuvP8UOnrX6fxLlWNFf5ng8/+nHZkfBD1kg5cC79xalK c3slPoqepdUi9fmUF78hqGdDzpR7BFrhtN2IvT5kJyFoTRfQEkC9uiAhtprof2oTa+Bl nUdk36zP+EETq2k/zNDtA+NGsRDz5WuMH8DkxB0sj3WZXWzK67bL7HDufHmuBhq1EGgF gbRNJL3IZ/ZDfQaNi5Fyyeup5ADUPEG83P+0WLYdbG6ZSZjDRsAFdzlwA+Uztl/jdJW2 vxqg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r9-20020aa7d149000000b004acbeceab83si24692546edo.448.2023.03.25.12.17.59; Sat, 25 Mar 2023 12:18:00 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D64968C9DF; Sat, 25 Mar 2023 21:16:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 186BB68C904 for ; Sat, 25 Mar 2023 21:16:12 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id C47792404EE for ; Sat, 25 Mar 2023 20:16:11 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id huVVA4MRpKZV for ; Sat, 25 Mar 2023 20:16:10 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 4FD42240D1B for ; Sat, 25 Mar 2023 20:16:01 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5A1DE3A07F4 for ; Sat, 25 Mar 2023 20:15:55 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Mar 2023 20:15:28 +0100 Message-Id: <20230325191529.10578-22-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230325191529.10578-1-anton@khirnov.net> References: <20230325191529.10578-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/23] fftools/ffmpeg: clean up local includes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2/+TXuWxB3Dj Group them by the library, sort alphabetically. --- fftools/ffmpeg.c | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index eedd51d407..ae69d29ab7 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -68,40 +68,43 @@ #include #endif -#include "libavformat/avformat.h" -#include "libavdevice/avdevice.h" -#include "libswresample/swresample.h" -#include "libavutil/opt.h" +#include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/channel_layout.h" -#include "libavutil/parseutils.h" -#include "libavutil/samplefmt.h" +#include "libavutil/dict.h" +#include "libavutil/display.h" #include "libavutil/fifo.h" #include "libavutil/hwcontext.h" +#include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" -#include "libavutil/dict.h" -#include "libavutil/display.h" +#include "libavutil/libm.h" #include "libavutil/mathematics.h" +#include "libavutil/opt.h" +#include "libavutil/parseutils.h" #include "libavutil/pixdesc.h" -#include "libavutil/avstring.h" -#include "libavutil/libm.h" -#include "libavutil/imgutils.h" -#include "libavutil/timestamp.h" -#include "libavutil/bprint.h" -#include "libavutil/time.h" +#include "libavutil/samplefmt.h" #include "libavutil/thread.h" #include "libavutil/threadmessage.h" +#include "libavutil/time.h" +#include "libavutil/timestamp.h" + #include "libavcodec/version.h" -# include "libavfilter/avfilter.h" -# include "libavfilter/buffersrc.h" -# include "libavfilter/buffersink.h" +#include "libavformat/avformat.h" + +#include "libavdevice/avdevice.h" + +#include "libswresample/swresample.h" + +#include "libavfilter/avfilter.h" +#include "libavfilter/buffersrc.h" +#include "libavfilter/buffersink.h" -#include "ffmpeg.h" #include "cmdutils.h" +#include "ffmpeg.h" #include "sync_queue.h" -#include "libavutil/avassert.h" - const char program_name[] = "ffmpeg"; const int program_birth_year = 2000;