[FFmpeg-cvslog] Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116'

Michael Niedermayer git at videolan.org
Tue Jan 27 14:33:53 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 14:24:41 2015 +0100| [b6938c94d641c539f1ee5225f6af7ffb58d3a0fc] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6938c94d641c539f1ee5225f6af7ffb58d3a0fc
---





More information about the ffmpeg-cvslog mailing list