[FFmpeg-cvslog] avformat: remove duplicate includes
Michael Niedermayer
git at videolan.org
Sat Sep 21 15:42:43 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 21 15:11:12 2013 +0200| [49515cb8407ba237329280d99ab7e79a02560dfe] | committer: Michael Niedermayer
avformat: remove duplicate includes
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=49515cb8407ba237329280d99ab7e79a02560dfe
---
libavformat/img2enc.c | 1 -
libavformat/mp3enc.c | 4 ----
libavformat/network.c | 1 -
libavformat/oggenc.c | 1 -
libavformat/os_support.h | 2 --
libavformat/rtpenc_chain.c | 1 -
libavformat/sapenc.c | 1 -
libavformat/utils.c | 1 -
libavformat/yuv4mpeg.c | 1 -
9 files changed, 13 deletions(-)
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c
index 11223fb..8adf352 100644
--- a/libavformat/img2enc.c
+++ b/libavformat/img2enc.c
@@ -28,7 +28,6 @@
#include "avformat.h"
#include "avio_internal.h"
#include "internal.h"
-#include "libavutil/opt.h"
typedef struct {
const AVClass *class; /**< Class for private options. */
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index 185ac63..a5f672b 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -30,10 +30,6 @@
#include "libavcodec/mpegaudiodecheader.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
-#include "libavcodec/mpegaudio.h"
-#include "libavcodec/mpegaudiodata.h"
-#include "libavcodec/mpegaudiodecheader.h"
-#include "libavformat/avio_internal.h"
#include "libavutil/dict.h"
#include "libavutil/avassert.h"
diff --git a/libavformat/network.c b/libavformat/network.c
index ddb3aae..ecba34d 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -24,7 +24,6 @@
#include "libavcodec/internal.h"
#include "libavutil/avutil.h"
#include "libavutil/mem.h"
-#include "url.h"
#include "libavutil/time.h"
#if HAVE_THREADS
diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index 3135de6..1883501 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -20,7 +20,6 @@
*/
#include "libavutil/crc.h"
-#include "libavutil/opt.h"
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "libavutil/random_seed.h"
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index b0f02c1..7c7cd1f 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -54,8 +54,6 @@
#include <io.h>
#endif
#define mkdir(a, b) _mkdir(a)
-#else
-#include <sys/stat.h>
#endif
static inline int is_dos_path(const char *path)
diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c
index 9379d94..dea1f70 100644
--- a/libavformat/rtpenc_chain.c
+++ b/libavformat/rtpenc_chain.c
@@ -22,7 +22,6 @@
#include "avformat.h"
#include "avio_internal.h"
#include "rtpenc_chain.h"
-#include "avio_internal.h"
#include "rtp.h"
#include "libavutil/opt.h"
diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index 6b1cd18..9fc78a8 100644
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -26,7 +26,6 @@
#include "libavutil/dict.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/time.h"
-#include "libavutil/dict.h"
#include "internal.h"
#include "network.h"
#include "os_support.h"
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1c5f088..48db0da 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -25,7 +25,6 @@
#include "libavcodec/internal.h"
#include "libavcodec/raw.h"
#include "libavcodec/bytestream.h"
-#include "libavutil/avassert.h"
#include "libavutil/opt.h"
#include "libavutil/dict.h"
#include "libavutil/internal.h"
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index a6d8346..1999c73 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -22,7 +22,6 @@
#include "libavutil/pixdesc.h"
#include "avformat.h"
#include "internal.h"
-#include "libavutil/pixdesc.h"
#define Y4M_MAGIC "YUV4MPEG2"
#define Y4M_FRAME_MAGIC "FRAME"
More information about the ffmpeg-cvslog
mailing list