[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       06/12/21 16:56:47

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_sdl.cpp 

Log message:
                * backend/sound_handler_sdl.cpp: Fixed bug #18244: Forgot to
                  write to the correct index, and to set a variabel to 0 in a 
loop.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1989&r2=1.1990
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1989
retrieving revision 1.1990
diff -u -b -r1.1989 -r1.1990
--- ChangeLog   21 Dec 2006 14:12:00 -0000      1.1989
+++ ChangeLog   21 Dec 2006 16:56:46 -0000      1.1990
@@ -1,3 +1,8 @@
+2006-12-21 Tomas Groth Christensen <address@hidden>
+
+       * backend/sound_handler_sdl.cpp: Fixed bug #18244: Forgot to
+         write to the correct index, and to set a variabel to 0 in a loop.
+
 2006-12-21 Sandro Santilli <address@hidden>
 
        * server/as_value.h (set_null): return a reference to self,

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- backend/sound_handler_sdl.cpp       30 Nov 2006 19:54:55 -0000      1.41
+++ backend/sound_handler_sdl.cpp       21 Dec 2006 16:56:47 -0000      1.42
@@ -820,8 +820,6 @@
                                }
 
                                // Then we decode some data
-                               int outsize = 0;        
-
                                // We loop until the size of the decoded sound 
is greater than the buffer size,
                                // or there is no more to decode.
                                unsigned int decoded_size = 0;
@@ -840,6 +838,7 @@
                                        // temp raw buffer
                                        Uint8* tmp_raw_buffer;
                                        unsigned int tmp_raw_buffer_size;
+                                       int outsize = 0;
 
 #ifdef USE_FFMPEG
                                        tmp_raw_buffer = new 
Uint8[AVCODEC_MAX_AUDIO_FRAME_SIZE];
@@ -970,7 +969,7 @@
                                        Uint8* tmp_buf = new Uint8[decoded_size 
+ tmp_raw_buffer_size];
                                        sound->raw_data_size = 1;
                                        memcpy(tmp_buf, 
sound->get_raw_data_ptr(0), decoded_size);
-                                       memcpy(tmp_buf, tmp_raw_buffer, 
tmp_raw_buffer_size);
+                                       memcpy(tmp_buf+decoded_size, 
tmp_raw_buffer, tmp_raw_buffer_size);
                                        decoded_size += tmp_raw_buffer_size;
                                        sound->delete_raw_data();
                                        sound->set_raw_data(tmp_buf);