Undefine DEBUG_SEEK.

[ffmpeg] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index b991a9318691f32468b1b9d14111b97bb9ee1a46..515e6f41c0a94d9ad7175887577185f7a3ab06ed 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -19,15 +19,21 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
-#include "allformats.h"
+#include "rtp_internal.h"
 
-#define REGISTER_MUXER(X,x) \
-          if(ENABLE_##X##_MUXER)   av_register_output_format(&x##_muxer)
-#define REGISTER_DEMUXER(X,x) \
-          if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer)
+/* 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); }
+#define REGISTER_DEMUXER(X,x) { \
+          extern AVInputFormat x##_demuxer; \
+          if(ENABLE_##X##_DEMUXER) av_register_input_format(&x##_demuxer); }
 #define REGISTER_MUXDEMUX(X,x)  REGISTER_MUXER(X,x); REGISTER_DEMUXER(X,x)
-#define REGISTER_PROTOCOL(X,x) \
-          if(ENABLE_##X##_PROTOCOL) register_protocol(&x##_protocol)
+#define REGISTER_PROTOCOL(X,x) { \
+          extern URLProtocol x##_protocol; \
+          if(ENABLE_##X##_PROTOCOL) register_protocol(&x##_protocol); }
 
 /* If you do not call this function, then you can select exactly which
    formats you want to support */
@@ -52,14 +58,13 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (AIFF, aiff);
     REGISTER_MUXDEMUX (AMR, amr);
     REGISTER_DEMUXER  (APC, apc);
+    REGISTER_DEMUXER  (APE, ape);
     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_DEMUXER  (AVS, avs);
     REGISTER_DEMUXER  (BETHSOFTVID, bethsoftvid);
     REGISTER_DEMUXER  (BKTR, bktr);