virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

doc/filters: Correct scale doc regarding w/h <= 0

Browse Source 
According to libavfilter/scale.c, if the width and height are both
less than or equal to 0 then the input size is used for both
dimensions. It does not need to be -1. -1:-1 is the same as 0:0 which
is the same as -10:-42, etc.

if (w < 0 && h < 0)
    eval_w = eval_h = 0;

The documentation for the zscale filter has also been updated since the
behavior is identical.

Signed-off-by: Kevin Mark <kmark937@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Kevin Mark
2017-06-12 01:59:05 -04:00
committed by Ronald S. Bultje
parent c7a2a379fd
commit 5aea18cbd8
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
doc/filters.texi
View File

@@ -12335,17 +12335,18 @@ the complete list of scaler options.
Set the output video dimension expression. Default value is the input Set the output video dimension expression. Default value is the input
dimension. dimension.
If the value is 0, the input width is used for the output. If the @var{width} or @var{w} value is 0, the input width is used for
the output. If the @var{height} or @var{h} value is 0, the input height
is used for the output.
If one of the values is -1, the scale filter will use a value that If one and only one of the values is -n with n >= 1, the scale filter
maintains the aspect ratio of the input image, calculated from the will use a value that maintains the aspect ratio of the input image,
other specified dimension. If both of them are -1, the input size is calculated from the other specified dimension. After that it will,
used however, make sure that the calculated dimension is divisible by n and
adjust the value if necessary.
If one of the values is -n with n > 1, the scale filter will also use a value If both values are -n with n >= 1, the behavior will be identical to
that maintains the aspect ratio of the input image, calculated from the other both values being set to 0 as previously detailed.
specified dimension. After that it will, however, make sure that the calculated
dimension is divisible by n and adjust the value if necessary.
See below for the list of accepted constants for use in the dimension See below for the list of accepted constants for use in the dimension
expression. expression.
@@ -15478,18 +15479,18 @@ The filter accepts the following options.
Set the output video dimension expression. Default value is the input Set the output video dimension expression. Default value is the input
dimension. dimension.
If the @var{width} or @var{w} is 0, the input width is used for the output. If the @var{width} or @var{w} value is 0, the input width is used for
If the @var{height} or @var{h} is 0, the input height is used for the output. the output. If the @var{height} or @var{h} value is 0, the input height
is used for the output.
If one of the values is -1, the zscale filter will use a value that If one and only one of the values is -n with n >= 1, the zscale filter
maintains the aspect ratio of the input image, calculated from the will use a value that maintains the aspect ratio of the input image,
other specified dimension. If both of them are -1, the input size is calculated from the other specified dimension. After that it will,
used however, make sure that the calculated dimension is divisible by n and
adjust the value if necessary.
If one of the values is -n with n > 1, the zscale filter will also use a value If both values are -n with n >= 1, the behavior will be identical to
that maintains the aspect ratio of the input image, calculated from the other both values being set to 0 as previously detailed.
specified dimension. After that it will, however, make sure that the calculated
dimension is divisible by n and adjust the value if necessary.
See below for the list of accepted constants for use in the dimension See below for the list of accepted constants for use in the dimension
expression. expression.