[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/asobj/SoundFfmpeg.cpp
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/asobj/SoundFfmpeg.cpp |
Date: |
Thu, 19 Jun 2008 18:49:22 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/06/19 18:49:22
Modified files:
. : ChangeLog
server/asobj : SoundFfmpeg.cpp
Log message:
* server/asobj/SoundFfmpeg.cpp (getAudio): return false
when willing to be detached. Manually detaching would result
in a deadlock.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6985&r2=1.6986
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.25&r2=1.26
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6985
retrieving revision 1.6986
diff -u -b -r1.6985 -r1.6986
--- ChangeLog 19 Jun 2008 18:40:01 -0000 1.6985
+++ ChangeLog 19 Jun 2008 18:49:21 -0000 1.6986
@@ -1,5 +1,11 @@
2008-06-19 Sandro Santilli <address@hidden>
+ * server/asobj/SoundFfmpeg.cpp (getAudio): return false
+ when willing to be detached. Manually detaching would result
+ in a deadlock.
+
+2008-06-19 Sandro Santilli <address@hidden>
+
* server/asobj/SoundFfmpeg.cpp (start): when streaming we
won't loop (at least this is what happens with pp, gnash
itself doesn't implement looping yet).
Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/SoundFfmpeg.cpp 19 Jun 2008 18:40:02 -0000 1.25
+++ server/asobj/SoundFfmpeg.cpp 19 Jun 2008 18:49:21 -0000 1.26
@@ -63,8 +63,7 @@
if ( ! _mediaParser->parsingCompleted() ) break;
// or detach and stop here...
- _soundHandler->detach_aux_streamer(this);
- return true; // return false might do the
detach itself actually...
+ return false; // will detach us
}
_leftOverData.reset( _audioDecoder->decode(*frame,
_leftOverSize) );