Allow building completely independent of FRSH

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

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index eb3f95418d779b7272c03be0f3808341bb78e7c4..d9800ae93d5d69eb63cde88ccaa96f8849590d43 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -24,16 +24,6 @@
 
 #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
 
 
@@ -225,5 +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
 }