Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 09:52:05 +0000 (11:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 09:53:14 +0000 (11:53 +0200)
commit7871eb43616776626ec9f9075b6d0a8cf73d159e
treef9a88703414cd33e32c5f682974d8b4f96837b92
parent587980eb7a1f4b0228204aa846b72dc761e49779
parent66acb76bb0492b263215ca9b4d927a7be39ace02
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>
13 files changed:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.h
libavcodec/hevc_ps_enc.c
libavcodec/qsv.c
libavcodec/qsv_internal.h
libavcodec/qsvdec.c
libavcodec/qsvenc.c
libavcodec/qsvenc.h
libavcodec/qsvenc_hevc.c
libavcodec/version.h