[Scummvm-cvs-logs] SF.net SVN: scummvm:[35390] scummvm/trunk/graphics

[thebluegr at users.sourceforge.net]

Revision: 35390
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35390&view=rev
Author:   thebluegr
Date:     2008-12-16 08:37:24 +0000 (Tue, 16 Dec 2008)

Log Message:
-----------
Synced Smacker player with ffmpeg revision #16143

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=16143&view=rev

Modified Paths:
--------------
    scummvm/trunk/graphics/smk_player.cpp
    scummvm/trunk/graphics/smk_player.h

Modified: scummvm/trunk/graphics/smk_player.cpp
===================================================================
--- scummvm/trunk/graphics/smk_player.cpp	2008-12-16 02:57:48 UTC (rev 35389)
+++ scummvm/trunk/graphics/smk_player.cpp	2008-12-16 08:37:24 UTC (rev 35390)
@@ -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 @@
 						break;
 					case 2:
 						for(i = 0; i < 2; i++) {
+							// 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);
-							p2 = _FullTree->getCode(bs);
 							for (j = 0; j < doubleY; ++j) {
 								out[0] = p1 & 0xff;
 								out[1] = p1 >> 8;

Modified: scummvm/trunk/graphics/smk_player.h
===================================================================
--- scummvm/trunk/graphics/smk_player.h	2008-12-16 02:57:48 UTC (rev 35389)
+++ scummvm/trunk/graphics/smk_player.h	2008-12-16 08:37:24 UTC (rev 35390)
@@ -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=markups
+// and the FFmpeg Smacker decoder (libavcodec/smacker.c), revision 16143
+// http://svn.ffmpeg.org/ffmpeg/trunk/libavcodec/smacker.c?revision=16143&view=markup
 
 #ifndef GRAPHICS_SMK_PLAYER_H
 #define GRAPHICS_SMK_PLAYER_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.