[FFmpeg-cvslog] Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 10 22:50:57 2013 +0200| [fc94b68eb53f02c596f7e9bc129162fe280e9008] | committer: Michael Niedermayer

Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'

* commit '72fbc9685c08baae7ab9996642707eaab873b6f1':
  avconv: use current syntax for the scale filter

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

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