[FFmpeg-cvslog] Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Sep 16 11:20:42 2015 +0200| [643a1560024f52ba56b56e812820765b3ae03be6] | committer: Hendrik Leppkes

Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'

* commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d':
  avfilter: Support both syntaxes for the scale filter

Not merged, ffmpeg has much more flexible option handling

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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