Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:33:27 +0000 (01:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Mar 2015 00:33:27 +0000 (01:33 +0100)
commit0a731e45964cda0606fc04128f41353d8282f091
tree652c5ac32280da901becae1c152ea73012bab921
parentd985976e54aec274d0c261091f77559d1a1bef84
parent72b7441a10f578a1d0be7083d8f5adf6a01921c2
Merge commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2'

* commit '72b7441a10f578a1d0be7083d8f5adf6a01921c2':
  lavc: add Intel libmfx-based H.264 encoder

Conflicts:
Changelog
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv_internal.h
libavcodec/qsvdec.h
libavcodec/qsvenc.c
libavcodec/qsvenc.h
libavcodec/qsvenc_h264.c
libavcodec/version.h