Move initialisations and internal symbols in allformats.h,

patch by Diego "Flameeyes" Petteno flameeyes AA gentoo PP org
Original thread:
Date: Jun 30, 2006 2:07 AM
Subject: [Ffmpeg-devel] [PATCH] Move initialisations and internal symbols in allformats.h

Originally committed as revision 5556 to svn://svn.ffmpeg.org/ffmpeg/trunk

8 files changed, 7 insertions, 176 deletions

diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 0e7152ca70..1e802acb24 100644
--- a/libavformat/aiff.c
+++ b/libavformat/aiff.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
+#include "allformats.h"
 #include "avi.h"
 #include "intfloat_readwrite.h"
 
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 68eef85a10..a567d7a610 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
+#include "allformats.h"
 
 /* If you do not call this function, then you can select exactly which
    formats you want to support */
diff --git a/libavformat/au.c b/libavformat/au.c
index 2d603f5f77..d81215795b 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -26,6 +26,7 @@
  */
 
 #include "avformat.h"
+#include "allformats.h"
 #include "avi.h"
 
 /* if we don't know the size in advance */
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4ac44c73ac..26e7f78187 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -390,186 +390,10 @@ int av_read_image(ByteIOContext *pb, const char *filename,
 int av_write_image(ByteIOContext *pb, AVImageFormat *fmt, AVImageInfo *img);
 
 extern AVImageFormat *first_image_format;
-#if 0
-extern AVImageFormat pnm_image_format;
-extern AVImageFormat pbm_image_format;
-extern AVImageFormat pgm_image_format;
-extern AVImageFormat ppm_image_format;
-extern AVImageFormat pam_image_format;
-extern AVImageFormat pgmyuv_image_format;
-extern AVImageFormat yuv_image_format;
-#ifdef CONFIG_ZLIB
-extern AVImageFormat png_image_format;
-#endif
-extern AVImageFormat jpeg_image_format;
-#endif
-extern AVImageFormat gif_image_format;
-//extern AVImageFormat sgi_image_format; //broken in itself
 
 /* XXX: use automatic init with either ELF sections or C file parser */
 /* modules */
 
-/* mpeg.c */
-extern AVInputFormat mpegps_demux;
-int mpegps_init(void);
-
-/* mpegts.c */
-extern AVInputFormat mpegts_demux;
-int mpegts_init(void);
-
-/* rm.c */
-int rm_init(void);
-
-/* crc.c */
-int crc_init(void);
-
-/* img.c */
-int img_init(void);
-
-/* img2.c */
-int img2_init(void);
-
-/* asf.c */
-int asf_init(void);
-
-/* avienc.c */
-int avienc_init(void);
-
-/* avidec.c */
-int avidec_init(void);
-
-/* swf.c */
-int swf_init(void);
-
-/* mov.c */
-int mov_init(void);
-
-/* movenc.c */
-int movenc_init(void);
-
-/* flvenc.c */
-int flvenc_init(void);
-
-/* flvdec.c */
-int flvdec_init(void);
-
-/* jpeg.c */
-int jpeg_init(void);
-
-/* gif.c */
-int gif_init(void);
-
-/* au.c */
-int au_init(void);
-
-/* amr.c */
-int amr_init(void);
-
-/* wav.c */
-int ff_wav_init(void);
-
-/* mmf.c */
-int ff_mmf_init(void);
-
-/* raw.c */
-int pcm_read_seek(AVFormatContext *s,
-                  int stream_index, int64_t timestamp, int flags);
-int raw_init(void);
-
-/* mp3.c */
-int mp3_init(void);
-
-/* yuv4mpeg.c */
-int yuv4mpeg_init(void);
-
-/* ogg2.c */
-int ogg_init(void);
-
-/* ogg.c */
-int libogg_init(void);
-
-/* dv.c */
-int ff_dv_init(void);
-
-/* ffm.c */
-int ffm_init(void);
-
-/* rtsp.c */
-extern AVInputFormat redir_demux;
-int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f);
-
-/* 4xm.c */
-int fourxm_init(void);
-
-/* psxstr.c */
-int str_init(void);
-
-/* idroq.c */
-int roq_init(void);
-
-/* ipmovie.c */
-int ipmovie_init(void);
-
-/* nut.c */
-int nut_init(void);
-
-/* wc3movie.c */
-int wc3_init(void);
-
-/* westwood.c */
-int westwood_init(void);
-
-/* segafilm.c */
-int film_init(void);
-
-/* idcin.c */
-int idcin_init(void);
-
-/* flic.c */
-int flic_init(void);
-
-/* sierravmd.c */
-int vmd_init(void);
-
-/* matroska.c */
-int matroska_init(void);
-
-/* sol.c */
-int sol_init(void);
-
-/* electronicarts.c */
-int ea_init(void);
-
-/* nsvdec.c */
-int nsvdec_init(void);
-
-/* daud.c */
-int daud_init(void);
-
-/* nuv.c */
-int nuv_init(void);
-
-/* aiff.c */
-int ff_aiff_init(void);
-
-/* voc.c */
-int voc_init(void);
-
-/* tta.c */
-int tta_init(void);
-
-/* adts.c */
-int ff_adts_init(void);
-
-/* mm.c */
-int mm_init(void);
-
-/* avs.c */
-int avs_init(void);
-
-/* smacker.c */
-int smacker_init(void);
-
 #include "rtp.h"
 
 #include "rtsp.h"
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 111ef59837..a8220c5ea5 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
+#include "allformats.h"
 #include "avi.h"
 
 typedef struct {
diff --git a/libavformat/sol.c b/libavformat/sol.c
index 078b826009..27ea5195c9 100644
--- a/libavformat/sol.c
+++ b/libavformat/sol.c
@@ -22,6 +22,7 @@
  */
 
 #include "avformat.h"
+#include "allformats.h"
 #include "avi.h"
 #include "bswap.h"
 
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3826df3f0a..42f54d6102 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
+#include "allformats.h"
 
 #undef NDEBUG
 #include <assert.h>
diff --git a/libavformat/wav.c b/libavformat/wav.c
index b53cee133a..8bf21ad716 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
+#include "allformats.h"
 #include "avi.h"
 
 const CodecTag codec_wav_tags[] = {