[FFmpeg-cvslog] Merge commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 15:53:40 2014 +0100| [9056d0c94af5c09478acf0e1bc129a9c539070f0] | committer: Michael Niedermayer

Merge commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d'

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

This also adds a missig #include to prevent breaking building

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9056d0c94af5c09478acf0e1bc129a9c539070f0
---