X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fallformats.c;h=5cafd6209d47a17b4337dd2af1ad266373fd9e50;hb=459821c53386f8eddadedbfe0ec19e11bf406ed5;hp=6ed3eb83d42d6f9aaa3837ba31756425740aca2f;hpb=d999cff5a3ae29833d65f640c64ded470cf0c6f0;p=ffmpeg

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 6ed3eb83d42..5cafd6209d4 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -21,9 +21,6 @@
 #include "avformat.h"
 #include "rtp_internal.h"
 
-/* rtp.c */
-void av_register_rtp_dynamic_payload_handlers(void);
-
 #define REGISTER_MUXER(X,x) { \
           extern AVOutputFormat x##_muxer; \
           if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer); }
@@ -43,15 +40,16 @@ void av_register_rtp_dynamic_payload_handlers(void);
  */
 void av_register_all(void)
 {
-    static int inited = 0;
+    static int initialized;
 
-    if (inited != 0)
+    if (initialized)
         return;
-    inited = 1;
+    initialized = 1;
 
     avcodec_init();
     avcodec_register_all();
 
+    /* (de)muxers */
     REGISTER_DEMUXER  (AAC, aac);
     REGISTER_MUXDEMUX (AC3, ac3);
     REGISTER_MUXER    (ADTS, adts);
@@ -62,23 +60,20 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (ASF, asf);
     REGISTER_MUXER    (ASF_STREAM, asf_stream);
     REGISTER_MUXDEMUX (AU, au);
-    REGISTER_MUXDEMUX (AUDIO_BEOS, audio_beos);
     REGISTER_MUXDEMUX (AVI, avi);
-#ifdef CONFIG_AVISYNTH
-    av_register_input_format(&avisynth_demuxer);
-#endif
+    REGISTER_DEMUXER  (AVISYNTH, avisynth);
+    REGISTER_MUXER    (AVM2, avm2);
     REGISTER_DEMUXER  (AVS, avs);
     REGISTER_DEMUXER  (BETHSOFTVID, bethsoftvid);
-    REGISTER_DEMUXER  (BKTR, bktr);
     REGISTER_DEMUXER  (C93, c93);
     REGISTER_MUXER    (CRC, crc);
     REGISTER_DEMUXER  (DAUD, daud);
     REGISTER_DEMUXER  (DSICIN, dsicin);
     REGISTER_DEMUXER  (DTS, dts);
     REGISTER_MUXDEMUX (DV, dv);
-    REGISTER_DEMUXER  (DV1394, dv1394);
     REGISTER_DEMUXER  (DXA, dxa);
     REGISTER_DEMUXER  (EA, ea);
+    REGISTER_DEMUXER  (EA_CDATA, ea_cdata);
     REGISTER_MUXDEMUX (FFM, ffm);
     REGISTER_MUXDEMUX (FLAC, flac);
     REGISTER_DEMUXER  (FLIC, flic);
@@ -95,9 +90,7 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (IMAGE2PIPE, image2pipe);
     REGISTER_DEMUXER  (INGENIENT, ingenient);
     REGISTER_DEMUXER  (IPMOVIE, ipmovie);
-    REGISTER_DEMUXER  (LIBDC1394, libdc1394);
-    if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
-    if (!ENABLE_NUT_MUXER)   REGISTER_MUXER   (LIBNUT, libnut);
+    REGISTER_DEMUXER  (LMLM4, lmlm4);
     REGISTER_MUXDEMUX (M4V, m4v);
     REGISTER_MUXDEMUX (MATROSKA, matroska);
     REGISTER_MUXER    (MATROSKA_AUDIO, matroska_audio);
@@ -109,6 +102,7 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (MP3, mp3);
     REGISTER_MUXER    (MP4, mp4);
     REGISTER_DEMUXER  (MPC, mpc);
+    REGISTER_DEMUXER  (MPC8, mpc8);
     REGISTER_MUXER    (MPEG1SYSTEM, mpeg1system);
     REGISTER_MUXER    (MPEG1VCD, mpeg1vcd);
     REGISTER_MUXER    (MPEG1VIDEO, mpeg1video);
@@ -128,7 +122,6 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (NUT, nut);
     REGISTER_DEMUXER  (NUV, nuv);
     REGISTER_MUXDEMUX (OGG, ogg);
-    REGISTER_MUXDEMUX (OSS, oss);
     REGISTER_MUXDEMUX (PCM_ALAW,  pcm_alaw);
     REGISTER_MUXDEMUX (PCM_MULAW, pcm_mulaw);
     REGISTER_MUXDEMUX (PCM_S16BE, pcm_s16be);
@@ -138,6 +131,7 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (PCM_U16LE, pcm_u16le);
     REGISTER_MUXDEMUX (PCM_U8,    pcm_u8);
     REGISTER_MUXER    (PSP, psp);
+    REGISTER_DEMUXER  (PVA, pva);
     REGISTER_MUXDEMUX (RAWVIDEO, rawvideo);
     REGISTER_MUXDEMUX (RM, rm);
     REGISTER_MUXDEMUX (ROQ, roq);
@@ -145,11 +139,12 @@ void av_register_all(void)
     REGISTER_MUXER    (RTP, rtp);
     REGISTER_DEMUXER  (RTSP, rtsp);
     REGISTER_DEMUXER  (SDP, sdp);
-#ifdef CONFIG_RTP_MUXER
+#ifdef CONFIG_SDP_DEMUXER
     av_register_rtp_dynamic_payload_handlers();
 #endif
     REGISTER_DEMUXER  (SEGAFILM, segafilm);
     REGISTER_DEMUXER  (SHORTEN, shorten);
+    REGISTER_DEMUXER  (SIFF, siff);
     REGISTER_DEMUXER  (SMACKER, smacker);
     REGISTER_DEMUXER  (SOL, sol);
     REGISTER_DEMUXER  (STR, str);
@@ -160,9 +155,8 @@ void av_register_all(void)
     REGISTER_DEMUXER  (TIERTEXSEQ, tiertexseq);
     REGISTER_DEMUXER  (TTA, tta);
     REGISTER_DEMUXER  (TXD, txd);
-    REGISTER_DEMUXER  (V4L2, v4l2);
-    REGISTER_DEMUXER  (V4L, v4l);
     REGISTER_DEMUXER  (VC1, vc1);
+    REGISTER_DEMUXER  (VC1T, vc1t);
     REGISTER_DEMUXER  (VMD, vmd);
     REGISTER_MUXDEMUX (VOC, voc);
     REGISTER_MUXDEMUX (WAV, wav);
@@ -170,9 +164,12 @@ void av_register_all(void)
     REGISTER_DEMUXER  (WSAUD, wsaud);
     REGISTER_DEMUXER  (WSVQA, wsvqa);
     REGISTER_DEMUXER  (WV, wv);
-    REGISTER_DEMUXER  (X11_GRAB_DEVICE, x11_grab_device);
     REGISTER_MUXDEMUX (YUV4MPEGPIPE, yuv4mpegpipe);
 
+    /* external libraries */
+    REGISTER_MUXDEMUX (LIBNUT, libnut);
+
+    /* protocols */
     REGISTER_PROTOCOL (FILE, file);
     REGISTER_PROTOCOL (HTTP, http);
     REGISTER_PROTOCOL (PIPE, pipe);