[Gnash-commit] gnash ChangeLog backend/sound_handler.h libbase...

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/07/08 20:26:49

Modified files:
        .              : ChangeLog 
        backend        : sound_handler.h 
        libbase        : FLVParser.h 

Log message:
                * backend/sound_handler.h libbase/FLVParser.h:
                  Document extra NELLYMOSER format code (mentioned in 
libavcodec/flv.h)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3677&r2=1.3678
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3677
retrieving revision 1.3678
diff -u -b -r1.3677 -r1.3678
--- ChangeLog   8 Jul 2007 15:59:26 -0000       1.3677
+++ ChangeLog   8 Jul 2007 20:26:48 -0000       1.3678
@@ -9,6 +9,8 @@
          Remove mention of old --enable-sound, fix default as --enable-plugin
          and talk about MAD / GST-FFMPEG differences.
        * gui/gtk_glue_cairo.h: Drop unused variable compiler warnings
+       * backend/sound_handler.h libbase/FLVParser.h:
+         Document extra NELLYMOSER format code (mentioned in libavcodec/flv.h)
 
 2007-07-07 Markus Gothe <address@hidden>
 

Index: backend/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- backend/sound_handler.h     1 Jul 2007 10:53:48 -0000       1.17
+++ backend/sound_handler.h     8 Jul 2007 20:26:49 -0000       1.18
@@ -18,7 +18,7 @@
 // 
 //
 
-/* $Id: sound_handler.h,v 1.17 2007/07/01 10:53:48 bjacques Exp $ */
+/* $Id: sound_handler.h,v 1.18 2007/07/08 20:26:49 martinwguy Exp $ */
 
 /// \page sound_handler_intro Sound handler introduction
 ///
@@ -77,6 +77,7 @@
                FORMAT_ADPCM = 1,       // decoded in the tag loader and passed 
through as NATIVE16
                FORMAT_MP3 = 2,
                FORMAT_UNCOMPRESSED = 3,// Little-endian 8- or 16-bit, should 
be passed through as FORMAT_NATIVE16
+               FORMAT_NELLYMOSER_8HZ_MONO = 5, // According to ffmpeg
                FORMAT_NELLYMOSER = 6,  // Mystery proprietary format; see 
nellymoser.com
                                
                // gnash tries to convert data to this format when possible:

Index: libbase/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/FLVParser.h 1 Jul 2007 10:54:06 -0000       1.16
+++ libbase/FLVParser.h 8 Jul 2007 20:26:49 -0000       1.17
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: FLVParser.h,v 1.16 2007/07/01 10:54:06 bjacques Exp $
+// $Id: FLVParser.h,v 1.17 2007/07/08 20:26:49 martinwguy Exp $
 
 // Information about the FLV format can be found at http://osflash.org/flv
 
@@ -45,6 +45,7 @@
        AUDIO_CODEC_ADPCM = 1,  // gnash doesn't pass this through; it 
uncompresses and sends FORMAT_NATIVE16
        AUDIO_CODEC_MP3 = 2,
        AUDIO_CODEC_UNCOMPRESSED = 3,   // 16 bits/sample, little-endian
+       FORMAT_NELLYMOSER_8HZ_MONO = 5, // According to ffmpeg
        AUDIO_CODEC_NELLYMOSER = 6      // Mystery proprietary format; see 
nellymoser.com
 };