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

[lephilousophe]

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

Summary:
cd8cd86a9e IMAGE: Move mpeg2dec.h inclusion in CPP file


Commit: cd8cd86a9e6c292b21bf20b339347cf6602e6c9f
    https://github.com/scummvm/scummvm/commit/cd8cd86a9e6c292b21bf20b339347cf6602e6c9f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-02-13T17:49:21+01:00

Commit Message:
IMAGE: Move mpeg2dec.h inclusion in CPP file

This avoids to pollute declarations with inttypes.h and mpeg2dec.h when
including mpeg.h

Changed paths:
    image/codecs/mpeg.cpp
    image/codecs/mpeg.h


diff --git a/image/codecs/mpeg.cpp b/image/codecs/mpeg.cpp
index bb40fe615d..944e905782 100644
--- a/image/codecs/mpeg.cpp
+++ b/image/codecs/mpeg.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/debug.h"
+#include "common/inttypes.h"
 #include "common/stream.h"
 #include "common/system.h"
 #include "common/textconsole.h"
@@ -29,6 +30,10 @@
 
 #include "image/codecs/mpeg.h"
 
+extern "C" {
+	#include <mpeg2dec/mpeg2.h>
+}
+
 namespace Image {
 
 MPEGDecoder::MPEGDecoder() : Codec() {
diff --git a/image/codecs/mpeg.h b/image/codecs/mpeg.h
index b711b680aa..73115a5248 100644
--- a/image/codecs/mpeg.h
+++ b/image/codecs/mpeg.h
@@ -25,13 +25,11 @@
 #ifndef IMAGE_CODECS_MPEG_H
 #define IMAGE_CODECS_MPEG_H
 
-#include "common/inttypes.h"
 #include "image/codecs/codec.h"
 #include "graphics/pixelformat.h"
 
-extern "C" {
-	#include <mpeg2dec/mpeg2.h>
-}
+typedef struct mpeg2dec_s mpeg2dec_t;
+typedef struct mpeg2_info_s mpeg2_info_t;
 
 namespace Common {
 class SeekableReadStream;