Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 09:17:12 +0000 (11:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Jul 2015 09:17:12 +0000 (11:17 +0200)
commit96ee6b9962ec0479deddedd64a46aef4846d90ba
tree5e04e55a9a85d82b124c76fd4cb36ef948306dea
parent07ae8fa20ef202206157efebf0a09db9a9cb9634
parent3a85397e8bb477eb34678d9edc52893f57003226
Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'

* commit '3a85397e8bb477eb34678d9edc52893f57003226':
  lavc: add Intel libmfx-based MPEG2 encoder

Conflicts:
Changelog
configure
libavcodec/allcodecs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsvenc.c
libavcodec/qsvenc_mpeg2.c