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)
* commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf':
  avconv_dxva2: add hevc support

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

Trivial merge