Merge commit 'c23999be134bde0a0554261a9043be7dbc01de0c'

* commit 'c23999be134bde0a0554261a9043be7dbc01de0c':
  avconv_opt: Add an option that lists all supported hwaccels

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
pull/146/head
Hendrik Leppkes 10 years ago
commit 80a12be10f

Diff Content Not Available