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

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Tomas Groth <tgc>       06/11/08 14:37:57

Modified files:
        .              : ChangeLog 
        backend        : sound_handler_sdl.cpp 

Log message:
        Made ffmpeg error handling more robust. Fixes bug #18207 (again).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.120&r2=1.1412.2.121
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.29.2.6&r2=1.29.2.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.120
retrieving revision 1.1412.2.121
diff -u -b -r1.1412.2.120 -r1.1412.2.121
--- ChangeLog   8 Nov 2006 10:08:22 -0000       1.1412.2.120
+++ ChangeLog   8 Nov 2006 14:37:56 -0000       1.1412.2.121
@@ -1,3 +1,8 @@
+2006-11-08 Tomas Groth Christensen <address@hidden>
+
+       * backend/sound_handler_sdl.cpp: Made ffmpeg error handling
+         more robust. Fixes bug #18207 (again).
+
 2006-11-08 Sandro Santilli <address@hidden>
 
        * libbase/smart_ptr.h: *fixed* invariant testing (well, at

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -b -r1.29.2.6 -r1.29.2.7
--- backend/sound_handler_sdl.cpp       7 Nov 2006 11:43:00 -0000       1.29.2.6
+++ backend/sound_handler_sdl.cpp       8 Nov 2006 14:37:56 -0000       1.29.2.7
@@ -755,9 +755,11 @@
                                        int tmp = 0;
                                        tmp = avcodec_decode_audio(sound->cc, 
(int16_t *)sound->raw_data, &outsize, frame, framesize);
 
-                                       if (bytes_decoded < 0) {
+                                       if (bytes_decoded < 0 || tmp < 0 || 
outsize < 0 || bytes_decoded != tmp) {
                                                gnash::log_error("Error while 
decoding MP3-stream\n");
-                                               // TODO: Remove the sound from 
the active list
+
+                                               // Setting data position to 
data size will get the sound removed
+                                               // from the active sound list 
later on.
                                                sound->position = 
sound->data_size;
                                                continue;
                                        }