This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

commit 86eb07154d0255a5e96c822d8dc7805ade600f0b
Author:     Niklas Haas <[email protected]>
AuthorDate: Thu Mar 5 18:52:38 2026 +0100
Commit:     Niklas Haas <[email protected]>
CommitDate: Thu Mar 12 22:09:13 2026 +0100

    doc/scaler: document new sws scaler flags
    
    And label the old ones as deprecated.
    
    Sponsored-by: Sovereign Tech Fund
    Signed-off-by: Niklas Haas <[email protected]>
---
 doc/scaler.texi | 66 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 53 insertions(+), 13 deletions(-)

diff --git a/doc/scaler.texi b/doc/scaler.texi
index 0c2b952395..aecc3ad248 100644
--- a/doc/scaler.texi
+++ b/doc/scaler.texi
@@ -11,48 +11,88 @@ For programmatic use, they can be set explicitly in the
 
 @table @option
 
+@anchor{scaler}
+@item scaler, scaler_sub
+Choose the scaling algorithm to use. Default value is @samp{auto} for both.
+It accepts the following values:
+
+@table @samp
+@item auto
+Aumotic choice. For @samp{scaler_sub}, this means the same algorithm as
+@samp{scaler}. For @samp{scaler}, this defaults to the scaler flag selected
+by @samp{sws_flags}.
+
+@item bilinear
+Bilinear filter. (AKA triangle filter)
+
+@item bicubic
+2-tap cubic BC-spline (AKA Mitchell-Netravali spline). The B and C parameters
+can be configured by setting @code{param0} and @code{param1}, defaulting to
+0.0 and 0.6 respectively.
+
+@item point, neighbor
+Point sampling (AKA nearest neighbor).
+
+@item area
+Area averaging. Equivalent to @samp{bilinear} for upscaling.
+
+@item gaussian
+2-tap Gaussian filter approximation. The sharpness parameter can be configured
+by setting @code{param0}, defaulting to 3.0.
+
+@item sinc
+Unwindowed sinc filter.
+
+@item lanczos
+Lanczos resampling (sinc windowed sinc). The number of filter taps can
+be configured by setting @code{param0}, defaulting to 3.
+
+@item spline
+Unwindowed natural bicubic spline.
+@end table
+
 @anchor{sws_flags}
 @item sws_flags
 Set the scaler flags. This is also used to set the scaling
-algorithm. Only a single algorithm should be selected. Default
-value is @samp{bicubic}.
+algorithm, though this usage is deprecated in favor of setting @samp{scaler}.
+Only a single algorithm may be selected. Default value is @samp{bicubic}.
 
 It accepts the following values:
 @table @samp
 @item fast_bilinear
-Select fast bilinear scaling algorithm.
+Select fast bilinear scaling algorithm. (Deprecated)
 
 @item bilinear
-Select bilinear scaling algorithm.
+Select bilinear scaling algorithm. (Deprecated)
 
 @item bicubic
-Select bicubic scaling algorithm.
+Select bicubic scaling algorithm. (Deprecated)
 
 @item experimental
-Select experimental scaling algorithm.
+Select experimental scaling algorithm. (Deprecated)
 
 @item neighbor
-Select nearest neighbor rescaling algorithm.
+Select nearest neighbor rescaling algorithm. (Deprecated)
 
 @item area
-Select averaging area rescaling algorithm.
+Select averaging area rescaling algorithm. (Deprecated)
 
 @item bicublin
 Select bicubic scaling algorithm for the luma component, bilinear for
-chroma components.
+chroma components. (Deprecated)
 
 @item gauss
-Select Gaussian rescaling algorithm.
+Select Gaussian rescaling algorithm. (Deprecated)
 
 @item sinc
-Select sinc rescaling algorithm.
+Select sinc rescaling algorithm. (Deprecated)
 
 @item lanczos
 Select Lanczos rescaling algorithm. The default width (alpha) is 3 and can be
-changed by setting @code{param0}.
+changed by setting @code{param0}. (Deprecated)
 
 @item spline
-Select natural bicubic spline rescaling algorithm.
+Select natural bicubic spline rescaling algorithm. (Deprecated)
 
 @item print_info
 Enable printing/debug logging.

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to