RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 02:00:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  doc: document correct option to list encoders

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-30 16:00:47 +01:00
commit 6dc9d2cf47
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/encoders.texi
View File

@ -14,7 +14,7 @@ You can disable all the encoders with the configure option
with the options @code{--enable-encoder=@var{ENCODER}} / with the options @code{--enable-encoder=@var{ENCODER}} /
@code{--disable-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. enabled encoders.
@c man end ENCODERS @c man end ENCODERS