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

Revert "CONFIG_FRSH_PROTOCOL is already defined by configure generated headers"

This reverts commit f5138f4f6306ec8e90b7939a954b36998896649c.
---

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