---
avconv.c | 32 ++++++++++++--------------------
avconv.h | 12 +++++-------
avconv_filter.c | 2 --
avconv_opt.c | 3 ++-
avplay.c | 30 ++++++++++++++++--------------
avprobe.c | 6 ++++--
avserver.c | 28 ++++++++++++++--------------
cmdutils.c | 15 ++++++++++-----
cmdutils.h | 3 +--
9 files changed, 64 insertions(+), 67 deletions(-)
diff --git a/avconv.c b/avconv.c
index 7351b77..9e82c90 100644
--- a/avconv.c
+++ b/avconv.c
@@ -19,36 +19,34 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
-#include <ctype.h>
#include <string.h>
#include <math.h>
#include <stdlib.h>
#include <errno.h>
#include <signal.h>
#include <limits.h>
+
+#include "config.h"
+#include "avconv.h"
+#include "cmdutils.h"
+
#include "libavformat/avformat.h"
+
#include "libavdevice/avdevice.h"
-#include "libswscale/swscale.h"
-#include "libavresample/avresample.h"
+
#include "libavutil/opt.h"
#include "libavutil/channel_layout.h"
-#include "libavutil/parseutils.h"
#include "libavutil/samplefmt.h"
#include "libavutil/fifo.h"
-#include "libavutil/intreadwrite.h"
#include "libavutil/dict.h"
#include "libavutil/mathematics.h"
#include "libavutil/pixdesc.h"
-#include "libavutil/avstring.h"
-#include "libavutil/libm.h"
-#include "libavutil/imgutils.h"
#include "libavutil/time.h"
-#include "libavformat/os_support.h"
+#include "libavutil/avassert.h"
-# include "libavfilter/avfilter.h"
-# include "libavfilter/buffersrc.h"
-# include "libavfilter/buffersink.h"
+#include "libavfilter/avfilter.h"
+#include "libavfilter/buffersrc.h"
+#include "libavfilter/buffersink.h"
#if HAVE_SYS_RESOURCE_H
#include <sys/time.h>
@@ -57,6 +55,7 @@
#elif HAVE_GETPROCESSTIMES
#include <windows.h>
#endif
+
#if HAVE_GETPROCESSMEMORYINFO
#include <windows.h>
#include <psapi.h>
@@ -70,13 +69,6 @@
#include <pthread.h>
#endif
-#include <time.h>
-
-#include "avconv.h"
-#include "cmdutils.h"
-
-#include "libavutil/avassert.h"
-
const char program_name[] = "avconv";
const int program_birth_year = 2000;
diff --git a/avconv.h b/avconv.h
index 56876ec..5fa5514 100644
--- a/avconv.h
+++ b/avconv.h
@@ -19,15 +19,10 @@
#ifndef AVCONV_H
#define AVCONV_H
-#include "config.h"
-
#include <stdint.h>
#include <stdio.h>
-#if HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
+#include "config.h"
#include "cmdutils.h"
#include "libavformat/avformat.h"
@@ -37,12 +32,15 @@
#include "libavfilter/avfilter.h"
-#include "libavutil/avutil.h"
#include "libavutil/dict.h"
#include "libavutil/fifo.h"
#include "libavutil/pixfmt.h"
#include "libavutil/rational.h"
+#if HAVE_PTHREADS
+#include <pthread.h>
+#endif
+
#define VSYNC_AUTO -1
#define VSYNC_PASSTHROUGH 0
#define VSYNC_CFR 1
diff --git a/avconv_filter.c b/avconv_filter.c
index 348196f..22f7959 100644
--- a/avconv_filter.c
+++ b/avconv_filter.c
@@ -22,8 +22,6 @@
#include "libavfilter/avfilter.h"
-#include "libavresample/avresample.h"
-
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
diff --git a/avconv_opt.c b/avconv_opt.c
index bd8e7e5..706df4b 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -34,13 +34,14 @@
#include "libavutil/avutil.h"
#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
-#include "libavutil/fifo.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "libavutil/parseutils.h"
#include "libavutil/pixdesc.h"
#include "libavutil/pixfmt.h"
+#include "libswscale/swscale.h"
+
#define MATCH_PER_STREAM_OPT(name, type, outvar, fmtctx, st)\
{\
int i, ret;\
diff --git a/avplay.c b/avplay.c
index 00becbe..32558ab 100644
--- a/avplay.c
+++ b/avplay.c
@@ -19,43 +19,45 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
#include <inttypes.h>
#include <math.h>
#include <limits.h>
+#include <assert.h>
+
+#include "config.h"
+#include "cmdutils.h"
+
#include "libavutil/avstring.h"
#include "libavutil/colorspace.h"
#include "libavutil/mathematics.h"
-#include "libavutil/pixdesc.h"
-#include "libavutil/imgutils.h"
#include "libavutil/dict.h"
-#include "libavutil/parseutils.h"
#include "libavutil/samplefmt.h"
#include "libavutil/time.h"
+#include "libavutil/opt.h"
+
#include "libavformat/avformat.h"
+
#include "libavdevice/avdevice.h"
+
#include "libswscale/swscale.h"
+
#include "libavresample/avresample.h"
-#include "libavutil/opt.h"
+
#include "libavcodec/avfft.h"
#if CONFIG_AVFILTER
-# include "libavfilter/avfilter.h"
-# include "libavfilter/buffersink.h"
-# include "libavfilter/buffersrc.h"
+#include "libavfilter/avfilter.h"
+#include "libavfilter/buffersink.h"
+#include "libavfilter/buffersrc.h"
#endif
-#include "cmdutils.h"
-
-#include <SDL.h>
-#include <SDL_thread.h>
+#include "SDL.h"
+#include "SDL_thread.h"
#ifdef __MINGW32__
#undef main /* We don't want SDL to override our main() */
#endif
-#include <assert.h>
-
const char program_name[] = "avplay";
const int program_birth_year = 2003;
diff --git a/avprobe.c b/avprobe.c
index c7b3d39..be9255b 100644
--- a/avprobe.c
+++ b/avprobe.c
@@ -20,16 +20,18 @@
*/
#include "config.h"
+#include "cmdutils.h"
#include "libavformat/avformat.h"
+
#include "libavcodec/avcodec.h"
+
#include "libavutil/avstring.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/dict.h"
-#include "libavutil/libm.h"
+
#include "libavdevice/avdevice.h"
-#include "cmdutils.h"
const char program_name[] = "avprobe";
const int program_birth_year = 2007;
diff --git a/avserver.c b/avserver.c
index 56bcda9..bad5f60 100644
--- a/avserver.c
+++ b/avserver.c
@@ -19,19 +19,25 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "config.h"
-#if !HAVE_CLOSESOCKET
-#define closesocket close
-#endif
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/wait.h>
+#include <signal.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "config.h"
+#include "cmdutils.h"
+
#include "libavformat/avformat.h"
// FIXME those are internal headers, avserver _really_ shouldn't use them
#include "libavformat/ffm.h"
#include "libavformat/network.h"
#include "libavformat/os_support.h"
-#include "libavformat/rtpdec.h"
#include "libavformat/rtpproto.h"
#include "libavformat/rtsp.h"
#include "libavformat/avio_internal.h"
@@ -48,19 +54,13 @@
#include "libavutil/opt.h"
#include "libavutil/time.h"
-#include <stdarg.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
#if HAVE_POLL_H
#include <poll.h>
#endif
-#include <errno.h>
-#include <time.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include "cmdutils.h"
+#if !HAVE_CLOSESOCKET
+#define closesocket close
+#endif
const char program_name[] = "avserver";
const int program_birth_year = 2000;
diff --git a/cmdutils.c b/cmdutils.c
index 062d7ec..7930bef 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -29,27 +29,32 @@
references to libraries that are not being built. */
#include "config.h"
+#include "cmdutils.h"
+#include "version.h"
+
#include "libavformat/avformat.h"
+
#include "libavfilter/avfilter.h"
+
#include "libavdevice/avdevice.h"
+
#include "libavresample/avresample.h"
+
#include "libswscale/swscale.h"
+
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
-#include "libavutil/mathematics.h"
-#include "libavutil/imgutils.h"
#include "libavutil/parseutils.h"
#include "libavutil/pixdesc.h"
#include "libavutil/eval.h"
#include "libavutil/dict.h"
#include "libavutil/opt.h"
-#include "cmdutils.h"
-#include "version.h"
+
#if CONFIG_NETWORK
#include "libavformat/network.h"
#endif
+
#if HAVE_SYS_RESOURCE_H
-#include <sys/time.h>
#include <sys/resource.h>
#endif
diff --git a/cmdutils.h b/cmdutils.h
index 997ba1c..d05f191 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -25,9 +25,8 @@
#include <stdint.h>
#include "libavcodec/avcodec.h"
-#include "libavfilter/avfilter.h"
+
#include "libavformat/avformat.h"
-#include "libswscale/swscale.h"
/**
* program name, defined by the program for show_version().
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
