[SCM] libav/experimental: Add a general [options] to the basic usage string.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8319aefeecdba4970586346aac0481e2ceb4e90b
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Mon Dec 21 02:10:14 2009 +0000

    Add a general [options] to the basic usage string.
    
    Originally committed as revision 20903 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 2e3c610..0c578ed 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3567,7 +3567,7 @@ static void show_help(void)
 {
     av_log_set_callback(log_callback_help);
     printf("Hyper fast Audio and Video encoder\n");
-    printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n");
+    printf("usage: ffmpeg [options] [[infile options] -i infile]... {[outfile options] outfile}...\n");
     printf("\n");
     show_help_options(options, "Main options:\n",
                       OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, 0);

-- 
Libav/FFmpeg packaging