[Gnash-commit] [SCM] Gnash branch, master, updated. c79cb009ea5810fc134ee921370c69e61c6c80d6

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  c79cb009ea5810fc134ee921370c69e61c6c80d6 (commit)
       via  5643ca472ffa89095221a59924de40d05baad100 (commit)
      from  af491c7fe5a2787954d1e841c5606b2a2ef208e1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=c79cb009ea5810fc134ee921370c69e61c6c80d6


commit c79cb009ea5810fc134ee921370c69e61c6c80d6
Author: Sandro Santilli <address@hidden>
Date:   Mon Dec 6 11:22:18 2010 +0100

    Throw an exception rather than aborting when asked to seek at negative 
position

diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 0d66044..bf5fa91 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -1124,7 +1124,12 @@ bool
 CurlStreamFile::seek(std::streampos pos)
 {
 
-    assert(pos >= 0);
+    if ( pos < 0 ) {
+        std::ostringstream os;
+        os << "CurlStreamFile: can't seek to negative absolute position "
+           << pos;
+        throw IOException(os.str());
+    }
 
 #ifdef GNASH_CURL_WARN_SEEKSBACK
     if ( pos < tell() ) {

http://git.savannah.gnu.org/cgit//commit/?id=5643ca472ffa89095221a59924de40d05baad100


commit 5643ca472ffa89095221a59924de40d05baad100
Author: Sandro Santilli <address@hidden>
Date:   Mon Dec 6 11:00:26 2010 +0100

    Log debug line on ffmpeg audio decoder initialization (symmetrically with 
video decoder behaviour)

diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index 678c709..5dfd478 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -141,6 +141,9 @@ void AudioDecoderFfmpeg::setup(SoundInfo& info)
         throw MediaException(err.str());
     }
 
+    log_debug(_("AudioDecoder: initialized FFMPEG codec %s (%d)"), 
+                _audioCodec->name, (int)codec_id);
+
     /// @todo do this only if !_needsParsing ?
     switch (_audioCodecCtx->codec->id)
     {

-----------------------------------------------------------------------

Summary of changes:
 libbase/curl_adapter.cpp               |    7 ++++++-
 libmedia/ffmpeg/AudioDecoderFfmpeg.cpp |    3 +++
 2 files changed, 9 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash