mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116'
* commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116': Add DXVA2 HEVC HWAccel Conflicts: configure libavcodec/allcodecs.c libavcodec/dxva2_hevc.c See: 36962ad2339d003f327336afd6d00ad3a5a58816 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b6938c94d6