diff options
| author | Torbjörn Andersson | 2018-06-25 07:33:43 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-11-04 22:33:22 +0100 |
| commit | 1255e8de4db11e3bdfaa2461cc72be6a74daa16c (patch) | |
| tree | 67c1c7550cad4f55fa386dd6851b0c62b65c648a | |
| parent | 1d69564876ad0048d49b968a5fbc01564dd74dba (diff) | |
| download | scummvm-rg350-1255e8de4db11e3bdfaa2461cc72be6a74daa16c.tar.gz scummvm-rg350-1255e8de4db11e3bdfaa2461cc72be6a74daa16c.tar.bz2 scummvm-rg350-1255e8de4db11e3bdfaa2461cc72be6a74daa16c.zip | |
VIDEO: Removed _psmESType
We weren't doing anything with it anyway. And I'm not sure it's
even available in the ZGI videos.
| -rw-r--r-- | video/mpegps_decoder.cpp | 10 | ||||
| -rw-r--r-- | video/mpegps_decoder.h | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/video/mpegps_decoder.cpp b/video/mpegps_decoder.cpp index 5d86e3f500..ee71ce268d 100644 --- a/video/mpegps_decoder.cpp +++ b/video/mpegps_decoder.cpp @@ -47,7 +47,6 @@ enum { MPEGPSDecoder::MPEGPSDecoder() { _stream = 0; - memset(_psmESType, 0, 256); } MPEGPSDecoder::~MPEGPSDecoder() { @@ -75,8 +74,6 @@ void MPEGPSDecoder::close() { _stream = 0; _streamMap.clear(); - - memset(_psmESType, 0, 256); } MPEGPSDecoder::MPEGStream *MPEGPSDecoder::getStream(uint32 startCode, Common::SeekableReadStream *packet) { @@ -376,13 +373,10 @@ void MPEGPSDecoder::parseProgramStreamMap(int length) { int esMapLength = _stream->readUint16BE(); while (esMapLength >= 4) { - byte type = _stream->readByte(); - byte esID = _stream->readByte(); + _stream->readByte(); // type + _stream->readByte(); // esID uint16 esInfoLength = _stream->readUint16BE(); - // Remember mapping from stream id to stream type - _psmESType[esID] = type; - // Skip program stream info _stream->skip(esInfoLength); diff --git a/video/mpegps_decoder.h b/video/mpegps_decoder.h index 15a9443f2f..74167a714f 100644 --- a/video/mpegps_decoder.h +++ b/video/mpegps_decoder.h @@ -164,7 +164,6 @@ private: uint32 readPTS(int c); void parseProgramStreamMap(int length); - byte _psmESType[256]; // A map from stream types to stream handlers typedef Common::HashMap<int, MPEGStream *> StreamMap; |