Michael Niedermayer 7871eb4361 Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02' ...

* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
  lavc: add Intel libmfx-based HEVC encoder

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsv.c
	libavcodec/qsvenc.c
	libavcodec/version.h

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

2015-07-09 11:53:14 +02:00

7.8 KiB

Raw Blame History

View Raw