You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116'
* commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116':
Add DXVA2 HEVC HWAccel
Conflicts:
configure
libavcodec/allcodecs.c
libavcodec/dxva2_hevc.c
See: 36962ad233
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in: