From 2225134e7d4992eecd2be8ced90977877a138e90 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 25 Mar 2023 20:02:23 +0100 Subject: [PATCH] fftools/ffmpeg: clean up #includes Drop unneeded ctype.h and math.h. Group all system headers together. Sort unconditional includes alphabetically. Group local includes by the library, sort alphabetically. --- fftools/ffmpeg.c | 78 ++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d2789b6f5b..750ab76693 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -24,14 +24,14 @@ */ #include "config.h" -#include -#include -#include -#include + #include #include #include #include +#include +#include +#include #if HAVE_IO_H #include @@ -40,34 +40,6 @@ #include #endif -#include "libavformat/avformat.h" -#include "libavdevice/avdevice.h" -#include "libswresample/swresample.h" -#include "libavutil/opt.h" -#include "libavutil/channel_layout.h" -#include "libavutil/parseutils.h" -#include "libavutil/samplefmt.h" -#include "libavutil/fifo.h" -#include "libavutil/hwcontext.h" -#include "libavutil/intreadwrite.h" -#include "libavutil/dict.h" -#include "libavutil/display.h" -#include "libavutil/mathematics.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/thread.h" -#include "libavutil/threadmessage.h" -#include "libavcodec/version.h" - -# include "libavfilter/avfilter.h" -# include "libavfilter/buffersrc.h" -# include "libavfilter/buffersink.h" - #if HAVE_SYS_RESOURCE_H #include #include @@ -83,7 +55,6 @@ #include #endif - #if HAVE_SYS_SELECT_H #include #endif @@ -97,13 +68,42 @@ #include #endif -#include - -#include "ffmpeg.h" -#include "cmdutils.h" -#include "sync_queue.h" - #include "libavutil/avassert.h" +#include "libavutil/avstring.h" +#include "libavutil/bprint.h" +#include "libavutil/channel_layout.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/libm.h" +#include "libavutil/mathematics.h" +#include "libavutil/opt.h" +#include "libavutil/parseutils.h" +#include "libavutil/pixdesc.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 "libavformat/avformat.h" + +#include "libavdevice/avdevice.h" + +#include "libswresample/swresample.h" + +#include "libavfilter/avfilter.h" +#include "libavfilter/buffersrc.h" +#include "libavfilter/buffersink.h" + +#include "cmdutils.h" +#include "ffmpeg.h" +#include "sync_queue.h" const char program_name[] = "ffmpeg"; const int program_birth_year = 2000;