[FFmpeg-cvslog] Merge commit '52ea29867070243385220a223d7512ea7d4ae2d2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 12 14:49:55 2013 +0200| [bc8240518830ba0d273bba6246392707ab55da2b] | committer: Michael Niedermayer

Merge commit '52ea29867070243385220a223d7512ea7d4ae2d2'

* commit '52ea29867070243385220a223d7512ea7d4ae2d2':
  fate: 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=bc8240518830ba0d273bba6246392707ab55da2b
---