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

[lephilousophe]

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

Summary:
3a943f77d7 VIDEO: Build MPEG video decoder even without MPEG2
f54edcf67c VIDEO: Guard HNM decoder declarations with USE_HNM define


Commit: 3a943f77d7e02947fbcaf8cff9f7917ec3f5c990
    https://github.com/scummvm/scummvm/commit/3a943f77d7e02947fbcaf8cff9f7917ec3f5c990
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-27T19:04:26+01:00

Commit Message:
VIDEO: Build MPEG video decoder even without MPEG2

MPEG container can be used for other codecs and can be built without
MPEG2 support.

Changed paths:
    video/module.mk


diff --git a/video/module.mk b/video/module.mk
index 1616e8660f1..8bee4bdfa1a 100644
--- a/video/module.mk
+++ b/video/module.mk
@@ -6,6 +6,7 @@ MODULE_OBJS := \
 	coktel_decoder.o \
 	dxa_decoder.o \
 	flic_decoder.o \
+	mpegps_decoder.o \
 	mve_decoder.o \
 	paco_decoder.o \
 	psx_decoder.o \
@@ -24,11 +25,6 @@ MODULE_OBJS += \
 	hnm_decoder.o
 endif
 
-ifdef USE_MPEG2
-MODULE_OBJS += \
-	mpegps_decoder.o
-endif
-
 ifdef USE_THEORADEC
 MODULE_OBJS += \
 	theora_decoder.o


Commit: f54edcf67cf618023cb7016ffa3a09c6bb74e837
    https://github.com/scummvm/scummvm/commit/f54edcf67cf618023cb7016ffa3a09c6bb74e837
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-12-27T19:05:42+01:00

Commit Message:
VIDEO: Guard HNM decoder declarations with USE_HNM define

This will make compilation fail if some dependency is missing instead of
failing at linking stage.

Changed paths:
    video/hnm_decoder.h


diff --git a/video/hnm_decoder.h b/video/hnm_decoder.h
index 4bd7502e415..af0735cf63a 100644
--- a/video/hnm_decoder.h
+++ b/video/hnm_decoder.h
@@ -19,6 +19,10 @@
  *
  */
 
+#include "common/scummsys.h"	// for USE_HNM
+
+#ifdef USE_HNM
+
 #ifndef VIDEO_HNM_DECODER_H
 #define VIDEO_HNM_DECODER_H
 
@@ -231,3 +235,5 @@ private:
 } // End of namespace Video
 
 #endif
+
+#endif