Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'

* commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401':
  vf_scale: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/avfilter.c
	libavfilter/vf_scale.c

scale keeps using our shorthand system due to the alternative not
supporting the more complex syntactical things like 1 parameter
dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 13 insertions, 11 deletions

diff --git a/doc/filters.texi b/doc/filters.texi
index 55abfff43c..0ac643681a 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4833,11 +4833,13 @@ A description of the accepted options follows.
 
 @table @option
 @item width, w
-Set the video width expression, default value is @code{iw}. See below
+Output video width.
+default value is @code{iw}. See below
 for the list of accepted constants.
 
 @item height, h
-Set the video heiht expression, default value is @code{ih}.
+Output video height.
+default value is @code{ih}.
 See below for the list of accepted constants.
 
 @item interl
@@ -4900,12 +4902,12 @@ If the input image format is different from the format requested by
 the next filter, the scale filter will convert the input to the
 requested format.
 
-If the value for @var{width} or @var{height} is 0, the respective input
+If the value for @var{w} or @var{h} is 0, the respective input
 size is used for the output.
 
-If the value for @var{width} or @var{height} is -1, the scale filter will
-use, for the respective output size, a value that maintains the aspect
-ratio of the input image.
+If the value for @var{w} or @var{h} is -1, the scale filter will use, for the
+respective output size, a value that maintains the aspect ratio of the input
+image.
 
 @subsection Examples
 
@@ -4913,7 +4915,7 @@ ratio of the input image.
 @item
 Scale the input video to a size of 200x100:
 @example
-scale=200:100
+scale=w=200:h=100
 @end example
 
 This is equivalent to:
@@ -4940,7 +4942,7 @@ scale=size=qcif
 @item
 Scale the input to 2x:
 @example
-scale=2*iw:2*ih
+scale=w=2*iw:h=2*ih
 @end example
 
 @item
@@ -4958,7 +4960,7 @@ scale=2*iw:2*ih:interl=1
 @item
 Scale the input to half size:
 @example
-scale=iw/2:ih/2
+scale=w=iw/2:h=ih/2
 @end example
 
 @item
@@ -4977,7 +4979,7 @@ scale=ih*PHI:ih
 @item
 Increase the height, and set the width to 3/2 of the height:
 @example
-scale=3/2*oh:3/5*ih
+scale=w=3/2*oh:h=3/5*ih
 @end example
 
 @item
@@ -4991,7 +4993,7 @@ scale="trunc(3/2*iw/hsub)*hsub:trunc(3/2*ih/vsub)*vsub"
 Increase the width to a maximum of 500 pixels, keep the same input
 aspect ratio:
 @example
-scale='min(500\, iw*3/2):-1'
+scale=w='min(500\, iw*3/2):h=-1'
 @end example
 @end itemize