diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/avtools-common-opts.texi | 25 | ||||
| -rw-r--r-- | doc/ffmpeg.texi | 2 |
2 files changed, 10 insertions, 17 deletions
diff --git a/doc/avtools-common-opts.texi b/doc/avtools-common-opts.texi index b05b5fa84e..91460b30b2 100644 --- a/doc/avtools-common-opts.texi +++ b/doc/avtools-common-opts.texi @@ -72,23 +72,16 @@ Encoding available @end table @item -codecs -Show available codecs. +Show all codecs known to libavcodec. -The fields preceding the codec names have the following meanings: -@table @samp -@item D -Decoding available -@item E -Encoding available -@item V/A/S -Video/audio/subtitle codec -@item S -Codec supports slices -@item D -Codec supports direct rendering -@item T -Codec can handle input truncated at random locations instead of only at frame boundaries -@end table +Note that the term 'codec' is used throughout this documentation as a shortcut +for what is more correctly called a media bitstream format. + +@item -decoders +Show available decoders. + +@item -encoders +Show all available encoders. @item -bsfs Show available bitstream filters. diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index ab7697abc5..89c1eb84c7 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -928,7 +928,7 @@ Try to make the choice automatically, in order to generate a sane output. Default value is -1. -@item -shortest +@item -shortest (@emph{output}) Finish encoding when the shortest input stream ends. @item -dts_delta_threshold Timestamp discontinuity delta threshold. |