[Gnash-commit] gnash ChangeLog libmedia/sdl/AudioDecoderFfmpeg...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/11/30 13:56:05

Modified files:
        .              : ChangeLog 
        libmedia/sdl   : AudioDecoderFfmpeg.cpp MediaParserFfmpeg.cpp 

Log message:
                * libmedia/sdl/AudioDecoderFfmpeg.cpp: Don't try to delete non-
                  existent codec context.
                * libmedia/sdl/MediaParserFfmpeg.cpp: Avoid moving stream 
position
                  before reading probe data.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5029&r2=1.5030
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/sdl/MediaParserFfmpeg.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5029
retrieving revision 1.5030
diff -u -b -r1.5029 -r1.5030
--- ChangeLog   30 Nov 2007 13:36:17 -0000      1.5029
+++ ChangeLog   30 Nov 2007 13:56:04 -0000      1.5030
@@ -1,3 +1,10 @@
+2007-11-30 Benjamin Wolsey <address@hidden>
+
+       * libmedia/sdl/AudioDecoderFfmpeg.cpp: Don't try to delete non-
+         existent codec context.
+       * libmedia/sdl/MediaParserFfmpeg.cpp: Avoid moving stream position
+         before reading probe data.
+
 2007-11-30 Sandro Santilli <address@hidden>
 
        * gui/kde.cpp (quit): use QApplication::exit.

Index: libmedia/sdl/AudioDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/AudioDecoderFfmpeg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libmedia/sdl/AudioDecoderFfmpeg.cpp 30 Nov 2007 00:13:02 -0000      1.7
+++ libmedia/sdl/AudioDecoderFfmpeg.cpp 30 Nov 2007 13:56:04 -0000      1.8
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: AudioDecoderFfmpeg.cpp,v 1.7 2007/11/30 00:13:02 tgc Exp $
+// $Id: AudioDecoderFfmpeg.cpp,v 1.8 2007/11/30 13:56:04 bwy Exp $
 
 #include "AudioDecoderFfmpeg.h"
 
@@ -33,7 +33,7 @@
 
 AudioDecoderFfmpeg::~AudioDecoderFfmpeg()
 {
-       if (_audioCodec) avcodec_close(_audioCodecCtx);
+       if (_audioCodecCtx) avcodec_close(_audioCodecCtx);
        if (_parser) av_parser_close(_parser);
 }
 

Index: libmedia/sdl/MediaParserFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/sdl/MediaParserFfmpeg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libmedia/sdl/MediaParserFfmpeg.cpp  30 Nov 2007 00:13:02 -0000      1.5
+++ libmedia/sdl/MediaParserFfmpeg.cpp  30 Nov 2007 13:56:04 -0000      1.6
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// $Id: MediaParserFfmpeg.cpp,v 1.5 2007/11/30 00:13:02 tgc Exp $
+// $Id: MediaParserFfmpeg.cpp,v 1.6 2007/11/30 13:56:04 bwy Exp $
 
 #include "MediaParserFfmpeg.h"
 #include "log.h"
@@ -66,14 +66,14 @@
        probe_data.buf = buffer.get();
        probe_data.buf_size = 4096;
 
-       // Check if the needed amount of data is available
-       if (stream->set_position(probe_data.buf_size) != 0) {
-               log_error(_("Gnash could not read from movie url"));
+       // Get probe data, making sure the necessary data is available
+       if (stream->read_bytes(probe_data.buf, probe_data.buf_size)
+                               < probe_data.buf_size)
+       {
+               log_error(_("Stream too short to determine input format"));
                return NULL;
        }
        
-       stream->read_bytes(probe_data.buf, probe_data.buf_size);
-
        return av_probe_input_format(&probe_data, 1);
 }