Michael Niedermayer d8bbb99c51 Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e' ...

* commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e':
  nvenc: H264 and HEVC encoders

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/version.h

This implementation is merged under the name nvenc_b*

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2015-06-01 03:13:55 +02:00

29 KiB

Raw Blame History

View Raw