Merge branch 'main' into develop/mpv

This commit is contained in:
Damontecres 2025-11-07 16:11:00 -05:00
commit 7acefe4ba3
No known key found for this signature in database
14 changed files with 370 additions and 151 deletions

1
.gitignore vendored
View file

@ -53,6 +53,7 @@ app/libs/
ffmpeg_decoder/
app/release/
app/debug/
<<<<<<< HEAD
# mpv
app/src/main/obj/