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)
commit80a12be10f39d5ce0c9e95f49d6b2ecb5750b334
tree0903418663ae6bb7a0d28476fbdc145a211a9253
parentad79fa471b6fc9b5d39d0ce4b5bb28cb616940bc
parentc23999be134bde0a0554261a9043be7dbc01de0c
Merge commit 'c23999be134bde0a0554261a9043be7dbc01de0c'

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

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