[FFmpeg-cvslog] doc/filters/scale: mention and link scaler options

Stefano Sabatini git at videolan.org
Mon Sep 30 17:29:59 CEST 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Mon Sep 30 16:50:44 2013 +0200| [d17aaad6308150828bbae2c78ad789401753b22d] | committer: Stefano Sabatini

doc/filters/scale: mention and link scaler options

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

 doc/filters.texi |    6 +++++-
 doc/scaler.texi  |    1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 5f22331..9e3fe5c 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -6559,7 +6559,11 @@ the next filter, the scale filter will convert the input to the
 requested format.
 
 @subsection Options
-The filter accepts the following options:
+The filter accepts the following options, or any of the options
+supported by the libswscale scaler.
+
+See @ref{scaler_options,,the ffmpeg-scaler manual,ffmpeg-scaler} for
+the complete list of scaler options.
 
 @table @option
 @item width, w
diff --git a/doc/scaler.texi b/doc/scaler.texi
index 0c61f41..0921551 100644
--- a/doc/scaler.texi
+++ b/doc/scaler.texi
@@ -1,3 +1,4 @@
+ at anchor{scaler_options}
 @chapter Scaler Options
 @c man begin SCALER OPTIONS
 



More information about the ffmpeg-cvslog mailing list