[FFmpeg-cvslog] Merge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 14:45:27 2015 +0100| [a1cdd1f08e06582c93fe66eacfc7c09e42321115] | committer: Michael Niedermayer

Merge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf'

* commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf':
  avconv_dxva2: add hevc support

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1cdd1f08e06582c93fe66eacfc7c09e42321115
---