Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 22:48:25 +0000 (00:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 22:52:05 +0000 (00:52 +0200)
commit0f630b7b1244e7fab3dc66c3fb396186f7c09065
tree85b064956994f96d05c098d1eb253dc2b7ebeb2e
parent2548f8a237b1ef85d1b56a897e93d5af206e4654
parented4b757177f9b563412cdbc8ee3405d82e10fc05
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>
doc/APIchanges
libavcodec/version.h