diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:24:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:25:02 +0100 |
| commit | b6938c94d641c539f1ee5225f6af7ffb58d3a0fc (patch) | |
| tree | 2727d0126d551e007881af6f8b0b63e8fa2afc5d | |
| parent | 2d4b8af4f6883fad76f45c33466bd86b35f1c3eb (diff) | |
| parent | 7e850fa67e32ebe98581c2e4ca4a4655dee7f116 (diff) | |
| download | ffmpeg-b6938c94d641c539f1ee5225f6af7ffb58d3a0fc.tar.gz | |
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>
0 files changed, 0 insertions, 0 deletions