diff options
| author | Filippos Karapetis | 2008-12-16 08:37:24 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-12-16 08:37:24 +0000 |
| commit | 638a8e330666e99f0f0887eebab8b50f61624fd4 (patch) | |
| tree | 4aaa8a9cdc85ca4c3fe3ee833ca0503ad60eed0a /graphics/smk_player.cpp | |
| parent | c45f149ea181c97a1dcacd9f89231d2fe396791b (diff) | |
| download | scummvm-rg350-638a8e330666e99f0f0887eebab8b50f61624fd4.tar.gz scummvm-rg350-638a8e330666e99f0f0887eebab8b50f61624fd4.tar.bz2 scummvm-rg350-638a8e330666e99f0f0887eebab8b50f61624fd4.zip | |
Synced Smacker player with ffmpeg revision #16143
svn-id: r35390
Diffstat (limited to 'graphics/smk_player.cpp')
| -rw-r--r-- | graphics/smk_player.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/graphics/smk_player.cpp b/graphics/smk_player.cpp index 758f98c7e6..33fc715317 100644 --- a/graphics/smk_player.cpp +++ b/graphics/smk_player.cpp @@ -24,8 +24,8 @@ */ // Based on http://wiki.multimedia.cx/index.php?title=Smacker -// and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 15884 -// http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=15884&view=markup +// and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143 +// http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=16143&view=markup #include "graphics/smk_player.h" #include "common/archive.h" @@ -577,8 +577,11 @@ bool SMKPlayer::decodeNextFrame() { break; case 2: for(i = 0; i < 2; i++) { - p1 = _FullTree->getCode(bs); + // We first get p2 and then p1 + // Check thread "[PATCH] Smacker video decoder bug fix" + // http://article.gmane.org/gmane.comp.video.ffmpeg.devel/78768 p2 = _FullTree->getCode(bs); + p1 = _FullTree->getCode(bs); for (j = 0; j < doubleY; ++j) { out[0] = p1 & 0xff; out[1] = p1 >> 8; |