Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 23:20:46 +0000 (01:20 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 23:20:46 +0000 (01:20 +0200)
commit508b79e6c1dc40d9d96d027ed38dab3a9b9a7287
treebac3551d01c1d7304475ab01effbfc4bd34576a6
parentbb619f41bea81e6ee9e208476a92fced4107a853
parent41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986
Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986'

* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
  lavc: add Intel libmfx-based HEVC decoder.

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsvdec.c
libavcodec/qsvdec_h2645.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsvdec.c
libavcodec/qsvdec.h
libavcodec/qsvdec_h2645.c
libavcodec/version.h