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)
* commit '3a85397e8bb477eb34678d9edc52893f57003226':
  lavc: add Intel libmfx-based MPEG2 encoder

Conflicts:
Changelog
configure
libavcodec/allcodecs.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

No differences found