summaryrefslogtreecommitdiffstats
path: root/scripts/build-presets.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2021-04-20 07:54:01 +0200
committerSven Gothel <[email protected]>2021-04-20 07:54:01 +0200
commitf0735c10b1ecf7b12c5e13f74bba5521e11fd8c0 (patch)
treecffb590eaa40716a535776d6ce0d09ddddead517 /scripts/build-presets.sh
parentd788cbfa6c66753ecd0da74c0ff8e85b4d263acd (diff)
VAAPI: Remove merge conflict, duplicate --[enable|disable]-vaapi entry in configure.pyhw-encoder-vaapi
Diffstat (limited to 'scripts/build-presets.sh')
0 files changed, 0 insertions, 0 deletions