[FFmpeg-cvslog] doc/encoders: Clarify that there are 2 prores encoders

Michael Niedermayer git at videolan.org
Thu Apr 11 23:15:49 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 23:08:13 2013 +0200| [70b72ca6f3fa1a7ad6f5297624c71f90d7885f7e] | committer: Michael Niedermayer

doc/encoders: Clarify that there are 2 prores encoders

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70b72ca6f3fa1a7ad6f5297624c71f90d7885f7e
---

 doc/encoders.texi |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/encoders.texi b/doc/encoders.texi
index 9da036b..ab88b6c 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -781,7 +781,10 @@ general presets system (e.g. passing the @code{-pre} option).
 
 Apple ProRes encoder.
 
- at subsection Private Options
+FFmpeg contains 2 ProRes encoders, the prores-aw and prores-ks encoder.
+The used encoder can be choosen with the @code{-vcodec} option.
+
+ at subsection Private Options for prores-ks
 
 @table @option
 @item profile @var{integer}



More information about the ffmpeg-cvslog mailing list