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)
commit643a1560024f52ba56b56e812820765b3ae03be6
tree338b26ebfb55b128bfe6ba7a051ba482bae8d45c
parentc2972a2800242229ac22e882fe60245a44ac026c
parent285fe5b098c8fbefaed4aacdb839b760a5b7f20d
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>