Allow building completely independent of FRSH

[frescor/ffmpeg.git] / libavformat / allformats.c

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 39ac3b82a642a14d1d3e3a327602f5237516d8bd..d9800ae93d5d69eb63cde88ccaa96f8849590d43 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -22,6 +22,11 @@
 #include "rtp.h"
 #include "rdt.h"
 
+#ifdef OMK_FOR_USER
+# include "libavformat_config.h"
+#endif
+
+
 #define REGISTER_MUXER(X,x) { \
     extern AVOutputFormat x##_muxer; \
     if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); }
@@ -102,7 +107,7 @@ void av_register_all(void)
     REGISTER_MUXDEMUX (MATROSKA, matroska);
     REGISTER_MUXER    (MATROSKA_AUDIO, matroska_audio);
     REGISTER_MUXDEMUX (MJPEG, mjpeg);
-    REGISTER_DEMUXER  (MLP, mlp);
+    REGISTER_MUXDEMUX (MLP, mlp);
     REGISTER_DEMUXER  (MM, mm);
     REGISTER_MUXDEMUX (MMF, mmf);
     REGISTER_MUXDEMUX (MOV, mov);
@@ -182,6 +187,7 @@ void av_register_all(void)
     REGISTER_MUXER    (TGP, tgp);
     REGISTER_DEMUXER  (THP, thp);
     REGISTER_DEMUXER  (TIERTEXSEQ, tiertexseq);
+    REGISTER_DEMUXER  (TMV, tmv);
     REGISTER_MUXDEMUX (TRUEHD, truehd);
     REGISTER_DEMUXER  (TTA, tta);
     REGISTER_DEMUXER  (TXD, txd);
@@ -209,4 +215,7 @@ void av_register_all(void)
     REGISTER_PROTOCOL (RTP, rtp);
     REGISTER_PROTOCOL (TCP, tcp);
     REGISTER_PROTOCOL (UDP, udp);
+#ifdef CONFIG_FFMPEG_WITH_FRSH
+    REGISTER_PROTOCOL (FRSH, frsh);
+#endif
 }