[Gnash-commit] gnash ChangeLog server/asobj/SoundFfmpeg.h libm...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/20 08:18:02

Modified files:
        .              : ChangeLog 
        server/asobj   : SoundFfmpeg.h 
        libmedia       : AudioDecoder.h 

Log message:
                * server/asobj/SoundFfmpeg.h: AudioDecoder.h expects 
_leftOverData to
                  be uint32_t, which isn't always the same as size_t.
                * libmedia/AudioDecoder.h: use legal header guards.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6994&r2=1.6995
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/AudioDecoder.h?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6994
retrieving revision 1.6995
diff -u -b -r1.6994 -r1.6995
--- ChangeLog   20 Jun 2008 07:37:22 -0000      1.6994
+++ ChangeLog   20 Jun 2008 08:18:01 -0000      1.6995
@@ -1,3 +1,9 @@
+2008-06-20 Benjamin Wolsey <address@hidden>
+
+       * server/asobj/SoundFfmpeg.h: AudioDecoder.h expects _leftOverData to
+         be uint32_t, which isn't always the same as size_t.
+       * libmedia/AudioDecoder.h: use legal header guards.
+
 2008-06-20 Bastiaan Jacques <address@hidden>
 
        * backend/render_handler_cairo.cpp: Implement set_translation and the

Index: server/asobj/SoundFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/SoundFfmpeg.h  19 Jun 2008 20:05:59 -0000      1.17
+++ server/asobj/SoundFfmpeg.h  20 Jun 2008 08:18:02 -0000      1.18
@@ -16,8 +16,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-#ifndef __SOUNDFFMPEG_H__
-#define __SOUNDFFMPEG_H__
+#ifndef GNASH_SOUNDFFMPEG_H
+#define GNASH_SOUNDFFMPEG_H
 
 #ifndef __STDC_CONSTANT_MACROS
 #define __STDC_CONSTANT_MACROS
@@ -83,7 +83,7 @@
 
        boost::scoped_array<boost::uint8_t> _leftOverData;
        boost::uint8_t* _leftOverPtr;
-       size_t _leftOverSize;
+       boost::uint32_t _leftOverSize;
 
        static bool getAudioWrapper(void *owner, boost::uint8_t *stream, int 
len);
 

Index: libmedia/AudioDecoder.h
===================================================================
RCS file: /sources/gnash/gnash/libmedia/AudioDecoder.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libmedia/AudioDecoder.h     11 Jun 2008 18:07:52 -0000      1.14
+++ libmedia/AudioDecoder.h     20 Jun 2008 08:18:02 -0000      1.15
@@ -17,8 +17,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-#ifndef __AUDIODECODER_H__
-#define __AUDIODECODER_H__
+#ifndef GNASH_AUDIODECODER_H
+#define GNASH_AUDIODECODER_H
 
 #include "SoundInfo.h"
 #include "Util.h"