diff --git a/osu.Framework.NativeLibs/scripts/ffmpeg/common.sh b/osu.Framework.NativeLibs/scripts/ffmpeg/common.sh index 9e24616412..465a7c0729 100755 --- 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 index 3bdfaf8479..36ae4b166d 100644 --- 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)