Michael Niedermayer 0f630b7b12 Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'
* commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05':
  dxva2_h264: add a workaround for old Intel GPUs

Conflicts:
	doc/APIchanges
	libavcodec/version.h

See: 8b2a130d3fe61e348092714dffa425b63c4d796c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29 00:52:05 +02:00
..
2014-04-22 20:44:31 +02:00
2014-04-11 17:51:33 +02:00
2014-04-27 15:30:25 +02:00
2014-04-19 02:18:45 +02:00
2013-08-29 22:52:04 +02:00