Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'

* commit '7c5012127fb7e18f0616011257bb4248f6a8b608':
  cmdutils: change semantics of show_help_options() and document it.
  avtools: move some newlines to show_help_options().
  avconv: deprecate -isync.

Conflicts:
	ffmpeg_opt.c
	ffserver.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 1 insertions, 1 deletions

diff --git a/ffserver.c b/ffserver.c
index 51eb07a63e..c03278c0b1 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4650,7 +4650,7 @@ static int show_help(const char *opt, const char *arg)
     printf("usage: ffserver [options]\n"
            "Hyper fast multi format Audio/Video streaming server\n");
     printf("\n");
-    show_help_options(options, "Main options:\n", 0, 0);
+    show_help_options(options, "Main options:", 0, 0);
     return 0;
 }