[Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/12/06 13:23:36

Modified files:
        .              : ChangeLog 
        server/swf     : tag_loaders.cpp 

Log message:
        Revert tag_loaders.cpp change.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5098&r2=1.5099
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.161&r2=1.162

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5098
retrieving revision 1.5099
diff -u -b -r1.5098 -r1.5099
--- ChangeLog   6 Dec 2007 12:50:24 -0000       1.5098
+++ ChangeLog   6 Dec 2007 13:23:35 -0000       1.5099
@@ -1,5 +1,10 @@
 2007-12-06 Benjamin Wolsey <address@hidden>
 
+       * server/swf/tag_loaders.cpp: revert last change; it stops
+         the parsing errors but causes segfaults.
+
+2007-12-06 Benjamin Wolsey <address@hidden>
+
        * server/swf/tag_loaders.cpp: Omit read of evidently optional latency
          bytes in MP3 audio. (Unused anyway).
        * libmedia/sdl/VideoDecoderFfmpeg.cpp: set FLV source line width

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- server/swf/tag_loaders.cpp  6 Dec 2007 12:50:24 -0000       1.161
+++ server/swf/tag_loaders.cpp  6 Dec 2007 13:23:35 -0000       1.162
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.161 2007/12/06 12:50:24 bwy Exp $ */
+/* $Id: tag_loaders.cpp,v 1.162 2007/12/06 13:23:35 bwy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1255,8 +1255,8 @@
     int latency = 0;
     if (format == media::AUDIO_CODEC_MP3)
     {
-        //in->ensureBytes(2);
-        //latency = in->read_s16(); // UNUSED !!
+        in->ensureBytes(2);
+        latency = in->read_s16(); // UNUSED !!
         //garbage = in->read_uint(16);
     }