From 24d90e3f4cd19034a4f4f1b98bb205e8f30a528a Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Mon, 30 Nov 2009 17:29:12 +0100 Subject: [PATCH] Allow building completely independent of FRSH --- libavformat/allformats.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) 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 } -- 2.39.2