Michael Niedermayer 0f630b7b12 Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05' ...

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

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

2014-04-29 00:52:05 +02:00

73 KiB

Raw Blame History

View Raw