diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-30 16:00:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-30 16:00:47 +0100 |
| commit | 6dc9d2cf4741203aeac479e8dc1ebe021abf9006 (patch) | |
| tree | 588cd17856d2c2ca7f17aa3fbffff73400a096ec /doc/encoders.texi | |
| parent | d85284d4aa7d388f33bd8a418df3a3cbe349cd39 (diff) | |
| parent | 64ba831da99c5526b21d510397b449742e92961e (diff) | |
| download | ffmpeg-streaming-6dc9d2cf4741203aeac479e8dc1ebe021abf9006.zip ffmpeg-streaming-6dc9d2cf4741203aeac479e8dc1ebe021abf9006.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/encoders.texi')
| -rw-r--r-- | doc/encoders.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi index dd659f3..d163440 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -14,7 +14,7 @@ You can disable all the encoders with the configure option with the options @code{--enable-encoder=@var{ENCODER}} / @code{--disable-encoder=@var{ENCODER}}. -The option @code{-codecs} of the ff* tools will display the list of +The option @code{-encoders} of the ff* tools will display the list of enabled encoders. @c man end ENCODERS |
