Merge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:45:27 +0000 (14:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:46:02 +0000 (14:46 +0100)
commita1cdd1f08e06582c93fe66eacfc7c09e42321115
tree2727d0126d551e007881af6f8b0b63e8fa2afc5d
parentb6938c94d641c539f1ee5225f6af7ffb58d3a0fc
parenta7e0380497306d9723dec8440a4c52e8bf0263cf
Merge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf'

* commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf':
  avconv_dxva2: add hevc support

See: 5f2cdf9c3cc5e1159428999ec550a3979576c213
Merged-by: Michael Niedermayer <michaelni@gmx.at>