diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ffmpeg-doc.texi | 4 | ||||
| -rw-r--r-- | doc/ffplay-doc.texi | 4 | ||||
| -rw-r--r-- | doc/ffserver-doc.texi | 4 | ||||
| -rw-r--r-- | doc/fftools-common-opts.texi | 7 |
4 files changed, 16 insertions, 3 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi index 14c4176886..b3de32ad73 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg-doc.texi @@ -222,10 +222,12 @@ specified for the inputs. @c man end @c man begin OPTIONS + +@include fftools-common-opts.texi + @section Main options @table @option -@include fftools-common-opts.texi @item -f @var{fmt} Force format. diff --git a/doc/ffplay-doc.texi b/doc/ffplay-doc.texi index e098259d07..f2f0d530db 100644 --- a/doc/ffplay-doc.texi +++ b/doc/ffplay-doc.texi @@ -26,10 +26,12 @@ ffplay [options] @file{input_file} @end example @c man begin OPTIONS + +@include fftools-common-opts.texi + @section Main options @table @option -@include fftools-common-opts.texi @item -x @var{width} Force displayed width. @item -y @var{height} diff --git a/doc/ffserver-doc.texi b/doc/ffserver-doc.texi index 444a8cd683..9c33e4104b 100644 --- a/doc/ffserver-doc.texi +++ b/doc/ffserver-doc.texi @@ -236,8 +236,10 @@ ffserver [options] @section Options @c man begin OPTIONS -@table @option + @include fftools-common-opts.texi + +@table @option @item -f @var{configfile} Use @file{configfile} instead of @file{/etc/ffserver.conf}. @item -n diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi index ce8a4d6240..4fc271d3e0 100644 --- a/doc/fftools-common-opts.texi +++ b/doc/fftools-common-opts.texi @@ -1,3 +1,9 @@ +@section Generic options + +These options are shared amongst the ff* tools. + +@table @option + @item -L Show license. @@ -63,3 +69,4 @@ Set the logging level used by the library. @item debug @end table +@end table |