[Scummvm-git-logs] scummvm master -> bbb22d7ca0dfc2645a8d00e59fddb7111c4b8b2a

[Scorpeg]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
bbb22d7ca0 VIDEO: Fixes for Microsoft MPEG-4 Video codec to make it component-like


Commit: bbb22d7ca0dfc2645a8d00e59fddb7111c4b8b2a
    https://github.com/scummvm/scummvm/commit/bbb22d7ca0dfc2645a8d00e59fddb7111c4b8b2a
Author: Scorp (scorp at mrs.mn)
Date: 2026-07-22T14:03:21+03:00

Commit Message:
VIDEO: Fixes for Microsoft MPEG-4 Video codec to make it component-like

Changed paths:
    configure
    engines/testbed/configure.engine
    image/codecs/codec.cpp
    image/module.mk


diff --git a/configure b/configure
index 827a0e32d4c..a6ea47a31ce 100755
--- a/configure
+++ b/configure
@@ -309,6 +309,7 @@ _indeo45=auto
 _hmi_audio=auto
 _hnm=auto
 _jyv1=auto
+_msmpeg4=auto
 _qdm2=auto
 _fmtowns_pc98_audio=auto
 _sid_audio=auto
@@ -358,6 +359,7 @@ add_component theoradec "libtheoradec" "_theoradec" "USE_THEORADEC"
 add_component midi "MIDI synthesis" "_midi" "USE_MIDI"
 add_component mpc "MPC" "_libmpcdec" "USE_MPCDEC"
 add_component mpeg2 "mpeg2" "_mpeg2" "USE_MPEG2"
+add_component msmpeg4 "Microsoft MPEG-4 v3" "_msmpeg4" "USE_MSMPEG4"
 add_component qdm2 "QDM2" "_qdm2" "USE_QDM2"
 add_component sid_audio "SID audio" "_sid_audio" "USE_SID_AUDIO"
 add_component svq1 "Sorenson Video 1" "_svq1" "USE_SVQ1"
diff --git a/engines/testbed/configure.engine b/engines/testbed/configure.engine
index 2d2a2e394a2..de7f7a95619 100644
--- a/engines/testbed/configure.engine
+++ b/engines/testbed/configure.engine
@@ -1,3 +1,3 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] [components]
-add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui midi universaltracker cdtoons indeo3 indeo45 vpx mpc hnm jyv1 mpeg2 qdm2 svq1 truemotion1 xan tinygl"
+add_engine testbed "TestBed: the Testing framework" no "" "" "" "imgui midi universaltracker cdtoons indeo3 indeo45 vpx mpc hnm jyv1 mpeg2 msmpeg4 qdm2 svq1 truemotion1 xan tinygl"
diff --git a/image/codecs/codec.cpp b/image/codecs/codec.cpp
index 63d9877bd89..3447e6dce4e 100644
--- a/image/codecs/codec.cpp
+++ b/image/codecs/codec.cpp
@@ -31,7 +31,9 @@
 #include "image/codecs/jyv1.h"
 #include "image/codecs/mjpeg.h"
 #include "image/codecs/mpeg.h"
+#ifdef USE_MSMPEG4
 #include "image/codecs/msmpeg4.h"
+#endif
 #include "image/codecs/msvideo1.h"
 #include "image/codecs/msrle.h"
 #include "image/codecs/msrle4.h"
@@ -90,7 +92,12 @@ Codec *createBitmapCodec(uint32 tag, uint32 streamTag, int width, int height, in
 	case MKTAG('m','p','4','3'):
 	case MKTAG('D','I','V','3'):
 	case MKTAG('d','i','v','3'):
+#ifdef USE_MSMPEG4
 		return new MSMPEG4Decoder(width, height, bitsPerPixel);
+#else
+		missingCodec = "Microsoft MPEG-4 v3";
+		break;
+#endif
 
 	case MKTAG('I','V','3','2'):
 #ifdef USE_INDEO3
diff --git a/image/module.mk b/image/module.mk
index 065ccd55763..8cf9104bf6d 100644
--- a/image/module.mk
+++ b/image/module.mk
@@ -22,7 +22,6 @@ MODULE_OBJS := \
 	codecs/hlz.o \
 	codecs/msrle.o \
 	codecs/msrle4.o \
-	codecs/msmpeg4.o \
 	codecs/msvideo1.o \
 	codecs/qtrle.o \
 	codecs/rpza.o \
@@ -43,6 +42,11 @@ MODULE_OBJS += \
 	codecs/mpeg.o
 endif
 
+ifdef USE_MSMPEG4
+MODULE_OBJS += \
+	codecs/msmpeg4.o
+endif
+
 ifdef USE_CDTOONS
 MODULE_OBJS += \
 	codecs/cdtoons.o