Merge commit '0ce3761c781f2c2de40a5a8a99563878804f47cc'

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index 8b819b693461772cc5da89cae2ae9c3ebbb68194..d4885dfa0eeacf4e5650d5e0dd0e4f73c9decd9f 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -1916,7 +1916,7 @@ static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream)
 
         avio_printf(pb, "<tr><td>%d<td>%s<td>%"PRId64
                         "<td>%s<td>%s\n",
-                    i, type, (int64_t)st->codecpar->bit_rate/1000,
+                    i, type, st->codecpar->bit_rate/1000,
                     codec ? codec->name : "", parameters);
      }
 
@@ -3950,7 +3950,7 @@ void show_help_default(const char *opt, const char *arg)
 }
 
 static const OptionDef options[] = {
-#include "cmdutils_common_opts.h"
+    CMDUTILS_COMMON_OPTIONS
     { "n", OPT_BOOL, {(void *)&no_launch }, "enable no-launch mode" },
     { "d", 0, {(void*)opt_debug}, "enable debug mode" },
     { "f", HAS_ARG | OPT_STRING, {(void*)&config.filename }, "use configfile instead of /etc/ffserver.conf", "configfile" },