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)
* commit '5b2b23f2d69e05c5fcd1c933e383fe60e185574d':
  dxva2: Retry IDirectXVideoDecoder_BeginFrame()

This also adds a missig #include to prevent breaking building

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

@@@ -21,6 -21,6 +21,7 @@@
   */
  
  #include "dxva2_internal.h"
++#include "libavutil/time.h"
  
  void *ff_dxva2_get_surface(const Picture *picture)
  {