Commit b6938c94 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7e850fa6'

* commit '7e850fa6':
  Add DXVA2 HEVC HWAccel

Conflicts:
	configure
	libavcodec/allcodecs.c
	libavcodec/dxva2_hevc.c

See: 36962ad2Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2d4b8af4 7e850fa6
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment