aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/options.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-01 17:13:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-01 17:13:22 +0200
commitdeed77ffeecae9e2ddb8f2955b476cd7e8b9b959 (patch)
treeaab21f921878ea91797100000423980cdf6cd0f4 /libswresample/options.c
parent3f36607ef0dfa2c11ae6d90959b8f94c8b429d68 (diff)
parent28fa58cf5d939151108345d7ddddebbd51d9b684 (diff)
downloadffmpeg-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/options.c')
0 files changed, 0 insertions, 0 deletions