Merge commit '285fe5b098c8fbefaed4aacdb839b760a5b7f20d'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:20:42 +0000 (11:20 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:20:42 +0000 (11:20 +0200)
* 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@gmail.com>

Trivial merge