Merge commit '285fe5b0'

* commit '285fe5b0':
  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>