Merge pull request #6068 from FreezyLemon/ffmpeg-add-msmpeg4-support

FFmpeg: Enable Microsoft MPEG-4 v1-3 decoders
ppy · Nov 30, 2023 · fe230a3 · fe230a3
2 parents 1716f53 + 889b3b0
commit fe230a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/osu.Framework.NativeLibs/scripts/ffmpeg/common.sh b/osu.Framework.NativeLibs/scripts/ffmpeg/common.sh
@@ -19,7 +19,7 @@ FFMPEG_FLAGS=(
     # File and video formats
     --enable-demuxer='mov,matroska,flv,avi' # mov = mp4, matroska = mkv & webm
     --enable-parser='mpeg4video,h264,hevc,vp8,vp9'
-    --enable-decoder='flv,mpeg4,h264,hevc,vp8,vp9'
+    --enable-decoder='flv,msmpeg4v1,msmpeg4v2,msmpeg4v3,mpeg4,h264,hevc,vp8,vp9'
     --enable-protocol=pipe
 )
 

diff --git a/osu.Framework/Graphics/Video/VideoDecoder.cs b/osu.Framework/Graphics/Video/VideoDecoder.cs
@@ -430,7 +430,7 @@ private void recreateCodecContext()
             }
 
             if (!openSuccessful)
-                throw new InvalidOperationException("No usable decoder found");
+                throw new InvalidOperationException($"No usable decoder found for codec ID {codecParams.codec_id}");
         }
 
         private void decodingLoop(CancellationToken cancellationToken)