Merge commit 'c23999be134bde0a0554261a9043be7dbc01de0c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 31 Aug 2015 08:01:58 +0000 (10:01 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 31 Aug 2015 08:01:58 +0000 (10:01 +0200)
* commit 'c23999be134bde0a0554261a9043be7dbc01de0c':
  avconv_opt: Add an option that lists all supported hwaccels

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

Trivial merge