[FFmpeg-cvslog] Merge commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 26 00:51:04 2015 +0200| [bb619f41bea81e6ee9e208476a92fced4107a853] | committer: Michael Niedermayer

Merge commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e'

* commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e':
  lavc: add Intel libmfx-based MPEG2 decoder.

Conflicts:
	configure
	libavcodec/qsvdec_mpeg2.c

Some cosmetics merged, rest is related to the removed parser code and
thus not merged

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb619f41bea81e6ee9e208476a92fced4107a853
---