[Scummvm-git-logs] scummvm master -> ffb69ca2a40858d7f82dade74cd5ab11342e16ad
whoozle
noreply at scummvm.org
Fri Jun 26 09:40:53 UTC 2026
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:
ffb69ca2a4 VIDEO: FOURXM: remove unused _version field
Commit: ffb69ca2a40858d7f82dade74cd5ab11342e16ad
https://github.com/scummvm/scummvm/commit/ffb69ca2a40858d7f82dade74cd5ab11342e16ad
Author: Vladimir Menshakov (vladimir.menshakov at gmail.com)
Date: 2026-06-26T10:39:19+01:00
Commit Message:
VIDEO: FOURXM: remove unused _version field
Changed paths:
video/4xm_decoder.cpp
diff --git a/video/4xm_decoder.cpp b/video/4xm_decoder.cpp
index f72ddb7f4f2..4e905b11cb8 100644
--- a/video/4xm_decoder.cpp
+++ b/video/4xm_decoder.cpp
@@ -373,7 +373,6 @@ class FourXMDecoder::FourXMVideoTrack : public FixedRateVideoTrack {
FourXMDecoder *_dec;
Common::Rational _frameRate;
uint _w, _h;
- uint16 _version = 0;
Common::ScopedPtr<Graphics::ManagedSurface> _framePtr, _lastFramePtr;
Graphics::Surface *_frame = nullptr, *_lastFrame = nullptr;
using HuffmanBitStream = Common::BitStreamMemory32LEMSB;
@@ -383,7 +382,7 @@ class FourXMDecoder::FourXMVideoTrack : public FixedRateVideoTrack {
Common::HashMap<byte, Common::Array<byte>> _cframes;
public:
- FourXMVideoTrack(FourXMDecoder *dec, const Common::Rational &frameRate, uint w, uint h, uint16 version) : _dec(dec), _frameRate(frameRate), _w(w), _h(h), _version(version) {
+ FourXMVideoTrack(FourXMDecoder *dec, const Common::Rational &frameRate, uint w, uint h, uint16 version) : _dec(dec), _frameRate(frameRate), _w(w), _h(h) {
_blockType[0].reset(new HuffmanType(HuffmanType::fromFrequencies({16, 8, 4, 2, 1, 1})));
_blockType[1].reset(new HuffmanType(HuffmanType::fromFrequencies({8, 0, 4, 2, 1, 1})));
_blockType[2].reset(new HuffmanType(HuffmanType::fromFrequencies({8, 4, 0, 2, 1, 1})));
More information about the Scummvm-git-logs
mailing list