Merge commit '766df7ca89a2398e71182f5f2b46053e3aa9bd69'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 19:39:26 +0000 (20:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 19:40:23 +0000 (20:40 +0100)
commit075989c33c847dfe83eda3d9f3ee640414d23702
tree4057c27ff26589d0676fbff2150eebc13d36bba3
parentf57baf743f0e69f3db54ae7b8e5b79d5ab35fb6e
parent766df7ca89a2398e71182f5f2b46053e3aa9bd69
Merge commit '766df7ca89a2398e71182f5f2b46053e3aa9bd69'

* commit '766df7ca89a2398e71182f5f2b46053e3aa9bd69':
  dxva2: Add missing #includes

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