Merge commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 19:45:51 +0000 (20:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 19:45:55 +0000 (20:45 +0100)
commit57a0c5fa9ca27d34d794beaece2462251bc06c2a
tree4c62f7df44265fbd068bcf8feb22f63951d8ba74
parent075989c33c847dfe83eda3d9f3ee640414d23702
parentade4ecb42d2dacd18d04eb8df2afa8131e5ad653
Merge commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653'

* commit 'ade4ecb42d2dacd18d04eb8df2afa8131e5ad653':
  dxva2: Use correct printf format strings

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxva2.c