[FFmpeg-cvslog] Merge commit '18adc1fd3bb739a240c59f87ec6837fdfa89d32e'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Sep 16 11:12:07 2015 +0200| [352eb4b5992e5784dfcb8a55f038f3ac00e406ca] | committer: Hendrik Leppkes

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=352eb4b5992e5784dfcb8a55f038f3ac00e406ca
---