diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 17:13:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 17:13:22 +0200 |
| commit | deed77ffeecae9e2ddb8f2955b476cd7e8b9b959 (patch) | |
| tree | aab21f921878ea91797100000423980cdf6cd0f4 /libswresample/swresample.c | |
| parent | 3f36607ef0dfa2c11ae6d90959b8f94c8b429d68 (diff) | |
| parent | 28fa58cf5d939151108345d7ddddebbd51d9b684 (diff) | |
| download | ffmpeg-deed77ffeecae9e2ddb8f2955b476cd7e8b9b959.tar.gz | |
Merge commit '28fa58cf5d939151108345d7ddddebbd51d9b684'
* commit '28fa58cf5d939151108345d7ddddebbd51d9b684':
dxva2: Fix build when only D3D11 or DXVA2 is used
Conflicts:
libavcodec/dxva2_internal.h
See: 94d07b314aa516284cc21ea720d4a305f881b6c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.c')
0 files changed, 0 insertions, 0 deletions