Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 20:58:57 +0000 (22:58 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 21:06:32 +0000 (23:06 +0200)
* commit '172b2cee17a3779c114ba065dd7b25dcf61e408f':
  dxva2: Add ifdefs around structs that might not be available

Conflicts:
libavcodec/dxva2.c

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

@@@ -135,8 -135,10 +135,10 @@@ int ff_dxva2_common_end_frame(AVCodecCo
  #if CONFIG_D3D11VA
      D3D11_VIDEO_DECODER_BUFFER_DESC buffer11[4];
  #endif
+ #if CONFIG_DXVA2
      DXVA2_DecodeBufferDesc          buffer2[4];
 -    DECODER_BUFFER_DESC             *buffer,*buffer_slice;
+ #endif
 +    DECODER_BUFFER_DESC             *buffer = NULL, *buffer_slice = NULL;
      int result, runs = 0;
      HRESULT hr;
      unsigned type;