[FFmpeg-cvslog] Merge commit 'c334c113d4d9e9a41bc38a3e4458d7ab21010401'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 20:29:25 2013 +0200| [85f115b5d8d7d8f39d9a2934242b108f5b7c891e] | committer: Michael Niedermayer

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 at gmx.at>

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