Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
TapiocaFox committed Aug 20, 2024
2 parents 173f61a + f441242 commit 6cae39d
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
22 changes: 21 additions & 1 deletion platforms/VideoPlayer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"databaseVersion": 14,
"revisionNumber": 3,
"revisionNumber": 4,
"platform": {
"name": "Video Player",
"uniqueId": "videos",
Expand Down Expand Up @@ -39,6 +39,26 @@
"killPackageProcessesWarning": true,
"extra": ""
},
{
"name": "videos - MXPlayer (Ad-sipported)",
"uniqueId": "ffmpeg.com.mxtech.videoplayer.ad",
"description": "Supported extensions: mkv, mpeg, mpg, avi, mp4, mov.",
"acceptedFilenameRegex": "^(.*)\\.(?:mp4|avi|mpg|mpeg|mov|mkv|webm|m4a)$",
"amStartArguments": "-n com.mxtech.videoplayer.ad/.ActivityScreen\n -a android.intent.action.VIEW\n -d {file.path} \n --activity-clear-task\n --activity-clear-top",
"killPackageProcesses": true,
"killPackageProcessesWarning": true,
"extra": ""
},
{
"name": "videos - MXPlayer Pro",
"uniqueId": "ffmpeg.com.mxtech.videoplayer.pro",
"description": "Supported extensions: mkv, mpeg, mpg, avi, mp4, mov.",
"acceptedFilenameRegex": "^(.*)\\.(?:mp4|avi|mpg|mpeg|mov|mkv|webm|m4a)$",
"amStartArguments": "-n com.mxtech.videoplayer.pro/.ActivityScreen\n -a android.intent.action.VIEW\n -d {file.path} \n --activity-clear-task\n --activity-clear-top",
"killPackageProcesses": true,
"killPackageProcessesWarning": true,
"extra": ""
},
{
"name": "videos - RetroArch 64 - ffmpeg",
"uniqueId": "ffmpeg.ra64.ffmpeg",
Expand Down
4 changes: 2 additions & 2 deletions platforms/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
"revisionNumber": 8
},
{
"filename": "SegaNaomi.json",
"filename": "SegaNAOMI.json",
"platformName": "Sega Naomi",
"platformShortname": "naomi",
"platformUniqueId": "naomi",
Expand Down Expand Up @@ -741,7 +741,7 @@
"platformName": "Video Player",
"platformShortname": "videos",
"platformUniqueId": "videos",
"revisionNumber": 3
"revisionNumber": 4
},
{
"filename": "VirtualBoy.json",
Expand Down

0 comments on commit 6cae39d

Please sign in to comment.