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)
commit352eb4b5992e5784dfcb8a55f038f3ac00e406ca
tree5159b0909fa5cd7b5413cd16835bffaf8896ba6b
parent182550e42c02b16ecb7fd2a77ea532c830c8ce78
parent18adc1fd3bb739a240c59f87ec6837fdfa89d32e
Merge commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e'

* 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>