mirror of https://git.ffmpeg.org/ffmpeg.git
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.
This commit is contained in:
parent
a2a09932f2
commit
2225134e7d
|
@ -24,14 +24,14 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <ctype.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <stdatomic.h>
|
#include <stdatomic.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
#if HAVE_IO_H
|
#if HAVE_IO_H
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
|
@ -40,34 +40,6 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#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
|
#if HAVE_SYS_RESOURCE_H
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -83,7 +55,6 @@
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if HAVE_SYS_SELECT_H
|
#if HAVE_SYS_SELECT_H
|
||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -97,13 +68,42 @@
|
||||||
#include <conio.h>
|
#include <conio.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <time.h>
|
|
||||||
|
|
||||||
#include "ffmpeg.h"
|
|
||||||
#include "cmdutils.h"
|
|
||||||
#include "sync_queue.h"
|
|
||||||
|
|
||||||
#include "libavutil/avassert.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 char program_name[] = "ffmpeg";
|
||||||
const int program_birth_year = 2000;
|
const int program_birth_year = 2000;
|
||||||
|
|
Loading…
Reference in New Issue