[Scummvm-git-logs] scummvm master -> 6f1e185f7d50ac22702ae3832e9959789e0dd54b
sev-
sev at scummvm.org
Wed Sep 23 23:28:31 UTC 2020
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:
6f1e185f7d AUDIO: Fix warnings
Commit: 6f1e185f7d50ac22702ae3832e9959789e0dd54b
https://github.com/scummvm/scummvm/commit/6f1e185f7d50ac22702ae3832e9959789e0dd54b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-09-24T01:28:17+02:00
Commit Message:
AUDIO: Fix warnings
Changed paths:
video/bink_decoder.h
diff --git a/video/bink_decoder.h b/video/bink_decoder.h
index 57dc4bb85d..8979b92317 100644
--- a/video/bink_decoder.h
+++ b/video/bink_decoder.h
@@ -149,21 +149,21 @@ private:
BinkVideoTrack(uint32 width, uint32 height, const Graphics::PixelFormat &format, uint32 frameCount, const Common::Rational &frameRate, bool swapPlanes, bool hasAlpha, uint32 id);
~BinkVideoTrack();
- uint16 getWidth() const { return _surface.w; }
- uint16 getHeight() const { return _surface.h; }
- Graphics::PixelFormat getPixelFormat() const { return _surface.format; }
- int getCurFrame() const { return _curFrame; }
- int getFrameCount() const { return _frameCount; }
- const Graphics::Surface *decodeNextFrame() { return &_surface; }
- bool isSeekable() const { return true; }
- bool seek(const Audio::Timestamp &time) { return true; }
+ uint16 getWidth() const override { return _surface.w; }
+ uint16 getHeight() const override{ return _surface.h; }
+ Graphics::PixelFormat getPixelFormat() const override { return _surface.format; }
+ int getCurFrame() const override { return _curFrame; }
+ int getFrameCount() const override { return _frameCount; }
+ const Graphics::Surface *decodeNextFrame() override { return &_surface; }
+ bool isSeekable() const override{ return true; }
+ bool seek(const Audio::Timestamp &time) override { return true; }
bool rewind() override;
void setCurFrame(uint32 frame) { _curFrame = frame; }
/** Decode a video packet. */
void decodePacket(VideoFrame &frame);
- Common::Rational getFrameRate() const { return _frameRate; }
+ Common::Rational getFrameRate() const override { return _frameRate; }
private:
/** A decoder state. */
More information about the Scummvm-git-logs
mailing list