[Gnash-commit] gnash ChangeLog libbase/FLVParser.cpp

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/05/31 11:20:47

Modified files:
        .              : ChangeLog 
        libbase        : FLVParser.cpp 

Log message:
                * libbase/FLVParser.cpp: (FLVFrame* FLVParser::nextMediaFrame)
                  Fixed a bug causing nextMediaFrame to return NULL.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3420&r2=1.3421
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3420
retrieving revision 1.3421
diff -u -b -r1.3420 -r1.3421
--- ChangeLog   31 May 2007 10:46:52 -0000      1.3420
+++ ChangeLog   31 May 2007 11:20:47 -0000      1.3421
@@ -1,3 +1,8 @@
+2007-05-31 Tomas Groth Christensen <address@hidden>
+
+       * libbase/FLVParser.cpp: (FLVFrame* FLVParser::nextMediaFrame)
+         Fixed a bug causing nextMediaFrame to return NULL.
+
 2007-05-31 Martin Guy <address@hidden>
 
         * libbase/embedVideoDecoderFfmpeg.cpp,

Index: libbase/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/FLVParser.cpp       30 May 2007 12:18:49 -0000      1.18
+++ libbase/FLVParser.cpp       31 May 2007 11:20:47 -0000      1.19
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: FLVParser.cpp,v 1.18 2007/05/30 12:18:49 strk Exp $
+// $Id: FLVParser.cpp,v 1.19 2007/05/31 11:20:47 tgc Exp $
 
 #include "FLVParser.h"
 #include "amf.h"
@@ -126,11 +126,11 @@
        uint32_t video_size = _videoFrames.size();
        uint32_t audio_size = _audioFrames.size();
 
-       if ( ! (audio_size <= _nextAudioFrame && video_size <= _nextVideoFrame) 
)
+       if (audio_size <= _nextAudioFrame && video_size <= _nextVideoFrame)
        {
 
                // Parse a media frame if any left or if needed
-               while(video_size == _videoFrames.size() && audio_size == 
_audioFrames.size() && !_parsingComplete) {
+               while(_videoFrames.size() <= _nextVideoFrame && 
_audioFrames.size() <= _nextAudioFrame && !_parsingComplete) {
                        if (!parseNextFrame()) break;
                }
        }