aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 17:09:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 17:09:57 +0200
commit3f36607ef0dfa2c11ae6d90959b8f94c8b429d68 (patch)
tree310ce55001c67ab7345f8b37ff65e7f04f5577b8 /libswresample
parentdf19c17ffb0e2307d96339690ce05b441fedde6c (diff)
parent31de41babcd96f8ac2e6632454737aecb3710df7 (diff)
downloadffmpeg-3f36607ef0dfa2c11ae6d90959b8f94c8b429d68.tar.gz
Merge commit '31de41babcd96f8ac2e6632454737aecb3710df7'
* commit '31de41babcd96f8ac2e6632454737aecb3710df7': configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va Conflicts: configure See: a838b22bd9f75028cdfb55bf9b322b3f3544421b Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions