Merge branch 'cooker-ffmpeg' into cooker

.github/workflows/cooker-selfhosted.yml

@@ -38,8 +38,8 @@ jobs:
           git submodule init
           git submodule update
           sudo apt install -y flatpak flatpak-builder p7zip-full
-          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13
+          sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          sudo flatpak install -y org.kde.Sdk//5.15-21.08 org.kde.Platform//5.15-21.08 io.qt.qtwebengine.BaseApp/x86_64/5.15-21.08 org.freedesktop.Sdk.Extension.llvm13 org.freedesktop.Platform.ffmpeg-full/x86_64/21.08
 
       # for main remember to change ${HOME} into ${GITHUB_WORKSPACE}
       - name: Build flatpak

net.retrodeck.retrodeck.yml

@@ -5,6 +5,7 @@ sdk: org.kde.Sdk
 # Needed for rpcs3
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.llvm13
+  - org.freedesktop.Platform.ffmpeg-full
 # /Needed for rpcs3
 # Needed for Yuzu
 base: io.qt.qtwebengine.BaseApp
@@ -150,21 +151,21 @@ modules:
   # ES-DE - START
   # https://gitlab.com/es-de/emulationstation-de
 
-  - name: ffmpeg
-    config-opts:
-    - --disable-static
-    - --disable-programs
-    - --disable-doc
-    - --enable-gpl
-    - --enable-shared
-    - --enable-libvorbis
-    - --enable-libopus
-    - --enable-libvpx
-    - --enable-postproc
-    sources:
-    - type: git
-      url: https://github.com/FFmpeg/FFmpeg.git
-      tag: n5.0
+  # - name: ffmpeg
+  #   config-opts:
+  #   - --disable-static
+  #   - --disable-programs
+  #   - --disable-doc
+  #   - --enable-gpl
+  #   - --enable-shared
+  #   - --enable-libvorbis
+  #   - --enable-libopus
+  #   - --enable-libvpx
+  #   - --enable-postproc
+  #   sources:
+  #   - type: git
+  #     url: https://github.com/FFmpeg/FFmpeg.git
+  #     tag: n5.0
 
   - name: freeimage
     no-autogen: true