[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-191-gaa7f559

[Bastiaan Jacques]

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  aa7f559e9a70d0bb85e377aaeeec93a1cbe651f4 (commit)
      from  c97c13d2a70361ea97eae61cdff66e2893171793 (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=aa7f559e9a70d0bb85e377aaeeec93a1cbe651f4


commit aa7f559e9a70d0bb85e377aaeeec93a1cbe651f4
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Mar 8 23:42:11 2011 +0100

    Don't throw an exception when FFMPEG seeks to a negative offset. Fixes bug 
#32001.

diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp 
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index 78d2f62..daf225a 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -546,9 +546,10 @@ MediaParserFfmpeg::seekMedia(boost::int64_t offset, int 
whence)
                                _("MediaParserFfmpeg couldn't parse input 
format: "
                                "tried to seek at negative offset %1%."))
                                % offset;
-                       throw MediaException(fmt.str());
+                       log_error(fmt);
+               } else {
+                       _stream->seek(offset);
                }
-               _stream->seek(offset);
        }
        else if (whence == SEEK_CUR)
        {

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

Summary of changes:
 libmedia/ffmpeg/MediaParserFfmpeg.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash