* commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116': Add DXVA2 HEVC HWAccel Conflicts: configure libavcodec/allcodecs.c libavcodec/dxva2_hevc.c See: 36962ad233 Merged-by: Michael Niedermayer <michaelni@gmx.at>
36962ad233