From e5bb37a0ee1cec9210e47c2552d67095b886580a Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sat, 28 Nov 2009 21:19:52 +0100 Subject: [PATCH] Revert "CONFIG_FRSH_PROTOCOL is already defined by configure generated headers" This reverts commit f5138f4f6306ec8e90b7939a954b36998896649c. --- libavformat/allformats.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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); } -- 2.39.2