[Scummvm-git-logs] scummvm master -> 8a47da88951414c8c895069f8bd10c8c3466db8d

[dreammaster]

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:
8a47da8895 VIDEO: Fix type redefinition when including MPEGPSDecoder


Commit: 8a47da88951414c8c895069f8bd10c8c3466db8d
    https://github.com/scummvm/scummvm/commit/8a47da88951414c8c895069f8bd10c8c3466db8d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2021-02-07T10:21:21-08:00

Commit Message:
VIDEO: Fix type redefinition when including MPEGPSDecoder

Changed paths:
    video/mpegps_decoder.h


diff --git a/video/mpegps_decoder.h b/video/mpegps_decoder.h
index 24773db9ef..1666049e3e 100644
--- a/video/mpegps_decoder.h
+++ b/video/mpegps_decoder.h
@@ -23,7 +23,6 @@
 #ifndef VIDEO_MPEGPS_DECODER_H
 #define VIDEO_MPEGPS_DECODER_H
 
-#include "common/inttypes.h"
 #include "common/hashmap.h"
 #include "common/queue.h"
 #include "graphics/surface.h"