Revert "CONFIG_FRSH_PROTOCOL is already defined by configure generated headers"

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

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index da5e5eba0e974effc44d010b66521829d03f2eb0..17dc7fcf4e8988d86618b960118a39d62d137a5c 100644 (file)
--- 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); }