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@gmail.com>
pull/151/head
Hendrik Leppkes 10 years ago
commit 643a156002

Diff Content Not Available