From 49515cb8407ba237329280d99ab7e79a02560dfe Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 21 Sep 2013 15:11:12 +0200 Subject: [PATCH] avformat: remove duplicate includes Signed-off-by: Michael Niedermayer --- 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 11223fba82..8adf3526a6 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 185ac63255..a5f672b257 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 ddb3aae6f1..ecba34d982 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 3135de6776..1883501745 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 b0f02c11f1..7c7cd1f1a4 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -54,8 +54,6 @@ #include #endif #define mkdir(a, b) _mkdir(a) -#else -#include #endif static inline int is_dos_path(const char *path) diff --git a/libavformat/rtpenc_chain.c b/libavformat/rtpenc_chain.c index 9379d94697..dea1f70dac 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 6b1cd18bc7..9fc78a83af 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 1c5f08805a..48db0da52b 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 a6d83469ef..1999c73364 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"