From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 30 Nov 2009 16:29:12 +0000 (+0100)
Subject: Allow building completely independent of FRSH
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/24d90e3f4cd19034a4f4f1b98bb205e8f30a528a

Allow building completely independent of FRSH
---

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index eb3f95418..d9800ae93 100644
--- 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
 }