From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Sat, 28 Nov 2009 19:57:55 +0000 (+0100)
Subject: CONFIG_FRSH_PROTOCOL is already defined by configure generated headers
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/ffmpeg.git/commitdiff_plain/f5138f4f6306ec8e90b7939a954b36998896649c

CONFIG_FRSH_PROTOCOL is already defined by configure generated headers

It is not necessary define it again.
---

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 17dc7fcf4..da5e5eba0 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -22,20 +22,6 @@
 #include "rtp.h"
 #include "rdt.h"
 
-#ifdef OMK_FOR_USER
-# include "libavformat_config.h"
-# 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); }