diff options
| author | Sven Gothel <[email protected]> | 2021-04-20 07:54:01 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2021-04-20 07:54:01 +0200 |
| commit | f0735c10b1ecf7b12c5e13f74bba5521e11fd8c0 (patch) | |
| tree | cffb590eaa40716a535776d6ce0d09ddddead517 /macosx/Base.lproj/PicturePreview.xib | |
| parent | d788cbfa6c66753ecd0da74c0ff8e85b4d263acd (diff) | |
VAAPI: Remove merge conflict, duplicate --[enable|disable]-vaapi entry in configure.pyhw-encoder-vaapi
Diffstat (limited to 'macosx/Base.lproj/PicturePreview.xib')
0 files changed, 0 insertions, 0 deletions