ffplay: add support for displaying rgb images with alpha

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index 8b819b693461772cc5da89cae2ae9c3ebbb68194..f9f987acac8e6203e32d9d5b193f657a8aef5219 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -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" },