Merge commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:12:07 +0000 (11:12 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:12:07 +0000 (11:12 +0200)
* commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e':
  avconv_filter: Use full named options

Not merged, as ffmpeg option syntax is quite different.

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

Trivial merge