From af25d85eb93df68d637f068f47087caef7709d05 Mon Sep 17 00:00:00 2001 From: John Williams Date: Thu, 21 Aug 2025 00:37:49 +1000 Subject: [PATCH] media player - add retroarch internal ffmpeg --- config/emulators/mplayer.conf | 2 +- .../H700/SUPPORTED_EMULATORS_AND_CORES.md | 2 +- projects/ROCKNIX/packages/virtual/emulators/package.mk | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/emulators/mplayer.conf b/config/emulators/mplayer.conf index 18107ffbf0..fcd8c48238 100644 --- a/config/emulators/mplayer.conf +++ b/config/emulators/mplayer.conf @@ -4,7 +4,7 @@ SYSTEM_MANUFACTURER=" System" SYSTEM_RELEASE="System" SYSTEM_HARDWARE="System" SYSTEM_PATH="/storage/roms/mplayer" -SYSTEM_EXTENSION=".mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd" +SYSTEM_EXTENSION=".3g2 .3gp .aac .ac3 .asf .avi .divx .dts .eac33 .f4f .f4v .flac .flv .m2p .m2ts .m3u .m4a .mka .mkv .mov .mp3 .mp4 .mpeg .mpg .mxf .ogg .ogm .opus .ps .sh .thd .ts .twi .vob .wav .webm .wma .wmv .wv .ytb" SYSTEM_PLATFORM="mplayer" SYSTEM_THEME="mplayer" SYSTEM_WIKI_PATH="mplayer" diff --git a/documentation/PER_DEVICE_DOCUMENTATION/H700/SUPPORTED_EMULATORS_AND_CORES.md b/documentation/PER_DEVICE_DOCUMENTATION/H700/SUPPORTED_EMULATORS_AND_CORES.md index 1ee5b7be3d..195ec167df 100644 --- a/documentation/PER_DEVICE_DOCUMENTATION/H700/SUPPORTED_EMULATORS_AND_CORES.md +++ b/documentation/PER_DEVICE_DOCUMENTATION/H700/SUPPORTED_EMULATORS_AND_CORES.md @@ -1,6 +1,6 @@ |Manufacturer|System|Release Date|Games Path|Supported Extensions|Emulator / Core| |----|----|----|----|----|----| -| System|Media Player (mplayer)|System|`mplayer`|.mp4 .mkv .avi .mov .wmv .m3u .mpg .ytb .twi .sh .mp3 .aac .mka .dts .flac .ogg .m4a .ac3 .opus .wav .wv .eac33 .thd|**mplayer:** mplayer (default)
| +| System|Media Player (mplayer)|System|`mplayer`|.3g2 .3gp .aac .ac3 .asf .avi .divx .dts .eac33 .f4f .f4v .flac .flv .m2p .m2ts .m3u .m4a .mka .mkv .mov .mp3 .mp4 .mpeg .mpg .mxf .ogg .ogm .opus .ps .sh .thd .ts .twi .vob .wav .webm .wma .wmv .wv .ytb|**mplayer:** mplayer (default)
**retroarch:** ffmpeg
| | System|Moonlight Game Streaming (moonlight)|System|`moonlight`|.sh|**moonlight:** moonlight (default)
| | System|Music Player (music)|System|`playlists`|.m3u .sh|**gmu:** gmu (default)
| | System|Ports (ports)|System|`ports`|.sh|**portmaster:** portmaster (default)
| diff --git a/projects/ROCKNIX/packages/virtual/emulators/package.mk b/projects/ROCKNIX/packages/virtual/emulators/package.mk index 2455b82012..536099fbe1 100644 --- a/projects/ROCKNIX/packages/virtual/emulators/package.mk +++ b/projects/ROCKNIX/packages/virtual/emulators/package.mk @@ -1303,6 +1303,8 @@ makeinstall_target() { ### Media Player add_emu_core mplayer mplayer mplayer true + # Note - there is actually no ffmpeg core, it is compiled into retroarch + add_emu_core mplayer retroarch ffmpeg false add_es_system mplayer ### Music Player