Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 18:29:25 +0000 (20:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Apr 2013 18:40:37 +0000 (20:40 +0200)
commit85f115b5d8d7d8f39d9a2934242b108f5b7c891e
tree4502b80cfcce9c082b5091a67022766222511f57
parentda3f89988f03ffb399879c5ffabed8b4111e548a
parentc334c113d4d9e9a41bc38a3e4458d7ab21010401
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>
doc/filters.texi
libavfilter/avfilter.c
libavfilter/vf_scale.c