Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 19:52:29 +0000 (20:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Feb 2015 20:12:04 +0000 (21:12 +0100)
commit841e9f431cf4b1be0b5c3932c289d405f34dfcc2
tree6f7c1159a0ceff4a7287b6f9725dd0fbd4fafc96
parent560eb7179a7c46ba277c9c120840816869a47a70
parent4e08c821106fc1d6d358864abf0d8488b12f38c6
Merge commit '4e08c821106fc1d6d358864abf0d8488b12f38c6'

* commit '4e08c821106fc1d6d358864abf0d8488b12f38c6':
  lavc: add an Intel libmfx-based H.264 decoder

Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsv.h
libavcodec/qsv_api.c
libavcodec/qsv_h264.c
libavcodec/qsv_internal.h
libavcodec/version.h