Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 22:46:20 +0000 (00:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 22:46:38 +0000 (00:46 +0200)
* commit 'a7c5fddac8137654cb503295c4dfb6492df43643':
  avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header

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

diff --cc ffmpeg_dxva2.c
Simple merge