Merge commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:53:40 +0000 (15:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 14:56:03 +0000 (15:56 +0100)
commit9056d0c94af5c09478acf0e1bc129a9c539070f0
tree9acdf2ee29f303a2cf2ff4ccfb75cc1fdaafdcce
parenta69dd1163b1a91978e596af551c9561d121aeedf
parent5b2b23f2d69e05c5fcd1c933e383fe60e185574d
Merge commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d'

* commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d':
  dxva2: Retry IDirectXVideoDecoder_BeginFrame()

This also adds a missig #include to prevent breaking building

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