* commit 'ed4b7571':
  dxva2_h264: add a workaround for old Intel GPUs

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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