xvba: squash mpeg2 changes (work in progress - waiting for xvba-sdk)

Conflicts:
	lib/ffmpeg/libavcodec/xvba_mpeg2.c