[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_
From: |
Tomas Groth |
Subject: |
[Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2] |
Date: |
Wed, 08 Nov 2006 14:54:20 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Tomas Groth <tgc> 06/11/08 14:54:19
Modified files:
. : ChangeLog
backend : sound_handler_sdl.cpp
Log message:
Fixed a deadlock.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.121&r2=1.1412.2.122
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.7&r2=1.29.2.8
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.121
retrieving revision 1.1412.2.122
diff -u -b -r1.1412.2.121 -r1.1412.2.122
--- ChangeLog 8 Nov 2006 14:37:56 -0000 1.1412.2.121
+++ ChangeLog 8 Nov 2006 14:54:19 -0000 1.1412.2.122
@@ -2,6 +2,7 @@
* backend/sound_handler_sdl.cpp: Made ffmpeg error handling
more robust. Fixes bug #18207 (again).
+ Fixed a deadlock.
2006-11-08 Sandro Santilli <address@hidden>
Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.29.2.7
retrieving revision 1.29.2.8
diff -u -b -r1.29.2.7 -r1.29.2.8
--- backend/sound_handler_sdl.cpp 8 Nov 2006 14:37:56 -0000 1.29.2.7
+++ backend/sound_handler_sdl.cpp 8 Nov 2006 14:54:19 -0000 1.29.2.8
@@ -755,13 +755,12 @@
int tmp = 0;
tmp = avcodec_decode_audio(sound->cc,
(int16_t *)sound->raw_data, &outsize, frame, framesize);
- if (bytes_decoded < 0 || tmp < 0 ||
outsize < 0 || bytes_decoded != tmp) {
+ if (bytes_decoded < 0 || tmp < 0 ||
outsize < 0) {
gnash::log_error("Error while
decoding MP3-stream\n");
-
// Setting data position to
data size will get the sound removed
// from the active sound list
later on.
sound->position =
sound->data_size;
- continue;
+ break;
}
sound->position += bytes_decoded;
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2], Tomas Groth, 2006/11/03
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2], Tomas Groth, 2006/11/06
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2], Tomas Groth, 2006/11/06
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2], Tomas Groth, 2006/11/07
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2], Tomas Groth, 2006/11/08
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2],
Tomas Groth <=
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2], Tomas Groth, 2006/11/08
- [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp [release_0_7_2], Tomas Groth, 2006/11/14