From c5e56a813bf6019f7c28ce7737fcb67e836136c6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 1 Aug 2008 22:29:29 +0000 Subject: Revert r14497 Log: Add missing header #includes. Policy violation (change not approved by maintainer) and while discussions where ongoing and no consensus has been reached. Originally committed as revision 14500 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 1 - libavformat/ffm.h | 2 -- libavformat/nut.h | 1 - libavformat/oggdec.h | 1 - libavformat/os_support.h | 2 -- libavformat/raw.h | 1 - libavformat/rm.h | 1 - libavformat/rtp.h | 1 - libavformat/rtp_aac.h | 1 - libavformat/rtp_h264.h | 1 - libavformat/rtp_mpv.h | 1 - libavformat/swf.h | 1 - 12 files changed, 14 deletions(-) (limited to 'libavformat') diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 529bf24cd7..c6586862e9 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -35,7 +35,6 @@ #define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION) -#include #include #include /* FILE */ #include "libavcodec/avcodec.h" diff --git a/libavformat/ffm.h b/libavformat/ffm.h index 1ede49a285..52a84094a8 100644 --- a/libavformat/ffm.h +++ b/libavformat/ffm.h @@ -22,9 +22,7 @@ #ifndef FFMPEG_FFM_H #define FFMPEG_FFM_H -#include #include "avformat.h" -#include "avio.h" /* The FFM file is made of blocks of fixed size */ #define FFM_HEADER_SIZE 14 diff --git a/libavformat/nut.h b/libavformat/nut.h index 23ddcaaecb..6acebc34b7 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -22,7 +22,6 @@ #ifndef FFMPEG_NUT_H #define FFMPEG_NUT_H -#include //#include //#include "libavutil/adler32.h" //#include "libavcodec/mpegaudio.h" diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 09407d2ff6..4e88d0e393 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -25,7 +25,6 @@ #ifndef FFMPEG_OGGDEC_H #define FFMPEG_OGGDEC_H -#include #include "avformat.h" typedef struct ogg_codec { diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 4c32ad54a2..34970e3952 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -27,8 +27,6 @@ * miscellaneous OS support macros and functions. */ -#include "config.h" - #ifdef __MINGW32__ # define WIN32_LEAN_AND_MEAN # include diff --git a/libavformat/raw.h b/libavformat/raw.h index d83bf3ab0c..3d851c829b 100644 --- a/libavformat/raw.h +++ b/libavformat/raw.h @@ -22,7 +22,6 @@ #ifndef FFMPEG_RAW_H #define FFMPEG_RAW_H -#include #include "avformat.h" int pcm_read_seek(AVFormatContext *s, diff --git a/libavformat/rm.h b/libavformat/rm.h index 0fea729123..2f7f8df2ee 100644 --- a/libavformat/rm.h +++ b/libavformat/rm.h @@ -22,7 +22,6 @@ #ifndef FFMPEG_RM_H #define FFMPEG_RM_H -#include #include "avformat.h" diff --git a/libavformat/rtp.h b/libavformat/rtp.h index 1603471c7c..36affed420 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -21,7 +21,6 @@ #ifndef FFMPEG_RTP_H #define FFMPEG_RTP_H -#include #include "libavcodec/avcodec.h" #include "avformat.h" diff --git a/libavformat/rtp_aac.h b/libavformat/rtp_aac.h index d4cbb59707..24b41cc425 100644 --- a/libavformat/rtp_aac.h +++ b/libavformat/rtp_aac.h @@ -20,7 +20,6 @@ #ifndef FFMPEG_RTP_AAC_H #define FFMPEG_RTP_AAC_H -#include #include "avformat.h" void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size); diff --git a/libavformat/rtp_h264.h b/libavformat/rtp_h264.h index db23f79128..0f23e525cc 100644 --- a/libavformat/rtp_h264.h +++ b/libavformat/rtp_h264.h @@ -22,7 +22,6 @@ #ifndef FFMPEG_RTP_H264_H #define FFMPEG_RTP_H264_H -#include #include "rtp_internal.h" extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; diff --git a/libavformat/rtp_mpv.h b/libavformat/rtp_mpv.h index c17939bc9f..36e649a891 100644 --- a/libavformat/rtp_mpv.h +++ b/libavformat/rtp_mpv.h @@ -20,7 +20,6 @@ #ifndef FFMPEG_RTP_MPV_H #define FFMPEG_RTP_MPV_H -#include #include "avformat.h" void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size); diff --git a/libavformat/swf.h b/libavformat/swf.h index 4ae2b90ef3..8249f7ddf9 100644 --- a/libavformat/swf.h +++ b/libavformat/swf.h @@ -25,7 +25,6 @@ #include "libavutil/fifo.h" #include "avformat.h" -#include "avio.h" #include "riff.h" /* for CodecTag */ /* should have a generic way to indicate probable size */ -- cgit v1.2.3