Fix warning when compiling with FRSH

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

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index e193af704dfaaf3f9a7f60d1b8e9f319b31ab27c..eb3f95418d779b7272c03be0f3808341bb78e7c4 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -22,6 +22,21 @@
 #include "rtp.h"
 #include "rdt.h"
 
+#ifdef OMK_FOR_USER
+# include "libavformat_config.h"
+#undef CONFIG_FRSH_PROTOCOL
+# ifdef CONFIG_FFMPEG_WITH_FRSH
+#  define CONFIG_FRSH_PROTOCOL 1
+# else
+#  define CONFIG_FRSH_PROTOCOL 0
+# endif
+#endif
+
+#ifndef CONFIG_FRSH_PROTOCOL
+#define CONFIG_FRSH_PROTOCOL 0
+#endif
+
+
 #define REGISTER_MUXER(X,x) { \
     extern AVOutputFormat x##_muxer; \
     if(CONFIG_##X##_MUXER) av_register_output_format(&x##_muxer); }
@@ -182,6 +197,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 +225,5 @@ void av_register_all(void)
     REGISTER_PROTOCOL (RTP, rtp);
     REGISTER_PROTOCOL (TCP, tcp);
     REGISTER_PROTOCOL (UDP, udp);
+    REGISTER_PROTOCOL (FRSH, frsh);
 }