[FFmpeg-devel] [PATCH 1/4] Statically initialize ffserver.c:config_filename, simplify.

[Stefano Sabatini]

On date Wednesday 2010-04-14 15:56:06 -0700, Baptiste Coudurier encoded:
> On 04/11/2010 11:28 AM, Stefano Sabatini wrote:
> >---
> >  ffserver.c |    5 ++---
> >  1 files changed, 2 insertions(+), 3 deletions(-)
> >
> >diff --git a/ffserver.c b/ffserver.c
> >index 9fd7eba..66df2df 100644
> >--- a/ffserver.c
> >+++ b/ffserver.c
> >@@ -293,7 +293,8 @@ static int rtp_new_av_stream(HTTPContext *c,
> >  static const char *my_program_name;
> >  static const char *my_program_dir;
> >
> >-static const char *config_filename;
> >+static const char *config_filename = "/etc/ffserver.conf";
> >+
> >  static int ffserver_debug;
> >  static int ffserver_daemon;
> >  static int no_launch;
> >@@ -4646,8 +4647,6 @@ int main(int argc, char **argv)
> >
> >      show_banner();
> >
> >-    config_filename = "/etc/ffserver.conf";
> >-
> >      my_program_name = argv[0];
> >      my_program_dir = getcwd(0, 0);
> >      ffserver_daemon = 1;
> 
> Ok

Applied.
-- 
FFmpeg = Free and Freak Meaningless Portentous Ecstatic God