diff options
| author | Johannes Schickel | 2011-05-01 16:54:45 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-05-01 16:54:45 +0200 |
| commit | 71bdb86e028db9556611f88b3686ce93312a8131 (patch) | |
| tree | 3c24233044a8e72bd8ecd73b981f50c725d5d282 /engines/sword25/fmv/movieplayer.cpp | |
| parent | 89b63e3adb4692c9659f8b133727ccc1e2af75b4 (diff) | |
| parent | 8ff527ac4ef4237e63c0802a22eb0f942089e6c4 (diff) | |
| download | scummvm-rg350-71bdb86e028db9556611f88b3686ce93312a8131.tar.gz scummvm-rg350-71bdb86e028db9556611f88b3686ce93312a8131.tar.bz2 scummvm-rg350-71bdb86e028db9556611f88b3686ce93312a8131.zip | |
Merge pull request #16 "Add a PixelFormat to Graphics::Surface.".
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16
Conflicts:
graphics/png.cpp
Diffstat (limited to 'engines/sword25/fmv/movieplayer.cpp')
| -rw-r--r-- | engines/sword25/fmv/movieplayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp index 919e669b68..975f08be22 100644 --- a/engines/sword25/fmv/movieplayer.cpp +++ b/engines/sword25/fmv/movieplayer.cpp @@ -125,7 +125,7 @@ void MoviePlayer::update() { const Graphics::Surface *s = _decoder.decodeNextFrame(); if (s) { // Transfer the next frame - assert(s->bytesPerPixel == 4); + assert(s->format.bytesPerPixel == 4); #ifdef THEORA_INDIRECT_RENDERING byte *frameData = (byte *)s->getBasePtr(0, 0); |