[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1776-gf71229b

[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  f71229bdbb17aaeddbc9d10b762092eff80f9501 (commit)
       via  eecaae6440d974d075ffe205647c97eda4e48aae (commit)
       via  546eda0f60a242db25b866e955d8510cbb732462 (commit)
       via  667ce17fe5396c9076b499b23f9cff760e2659dd (commit)
      from  fe92ee64a68e88f2a0cc3996b1278ad5f9e20aff (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=f71229bdbb17aaeddbc9d10b762092eff80f9501


commit f71229bdbb17aaeddbc9d10b762092eff80f9501
Author: Bastiaan Jacques <address@hidden>
Date:   Sun Sep 1 14:04:41 2013 +0200

    Fix header.

diff --git a/libsound/EmbedSoundInst.h b/libsound/EmbedSoundInst.h
index 6e1cb81..27ff8cf 100644
--- a/libsound/EmbedSoundInst.h
+++ b/libsound/EmbedSoundInst.h
@@ -20,13 +20,13 @@
 #ifndef SOUND_EMBEDSOUNDINST_H
 #define SOUND_EMBEDSOUNDINST_H
 
-#include <memory>
 #include <cassert>
 #include <boost/cstdint.hpp> // For C99 int types
+#include <limits>
 
+#include "EmbedSound.h"
 #include "LiveSound.h"
 #include "SoundEnvelope.h" 
-#include "EmbedSound.h" 
 
 // Forward declarations
 namespace gnash {

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


commit eecaae6440d974d075ffe205647c97eda4e48aae
Author: Bastiaan Jacques <address@hidden>
Date:   Sun Sep 1 13:54:00 2013 +0200

    Fix headers.

diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.h 
b/libmedia/ffmpeg/VideoDecoderFfmpeg.h
index 32e53d5..d471a6d 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.h
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.h
@@ -27,7 +27,6 @@
 #include <vector>
 #include <memory>
 #include "dsodefs.h" //For DSOEXPORT
-#include "log.h"
 #include "VideoDecoder.h"
 #include "MediaParser.h" // for videoCodecType enum
 #include "ffmpegHeaders.h"

http://git.savannah.gnu.org/cgit//commit/?id=546eda0f60a242db25b866e955d8510cbb732462


commit 546eda0f60a242db25b866e955d8510cbb732462
Author: Bastiaan Jacques <address@hidden>
Date:   Sun Sep 1 13:53:22 2013 +0200

    Fix comparisons.

diff --git a/libmedia/gst/MediaParserGst.cpp b/libmedia/gst/MediaParserGst.cpp
index b7bcf52..be34921 100644
--- a/libmedia/gst/MediaParserGst.cpp
+++ b/libmedia/gst/MediaParserGst.cpp
@@ -66,11 +66,11 @@ MediaParserGst::MediaParserGst(std::auto_ptr<IOChannel> 
stream)
     _srcpad = swfdec_gst_connect_srcpad (typefind, srccaps);
     gst_caps_unref(srccaps);
 
-    if (!gst_element_set_state (_bin, GST_STATE_PLAYING) == 
GST_STATE_CHANGE_SUCCESS) {
+    if (gst_element_set_state (_bin, GST_STATE_PLAYING) != 
GST_STATE_CHANGE_SUCCESS) {
         throw GnashException(_("MediaParserGst could not change element 
state"));
     }
     
-    if (!gst_element_set_state (_bin, GST_STATE_PLAYING) == 
GST_STATE_CHANGE_SUCCESS) {
+    if (gst_element_set_state (_bin, GST_STATE_PLAYING) != 
GST_STATE_CHANGE_SUCCESS) {
         throw MediaException(_("MediaParserGst could not change element 
state"));
     }
 
@@ -278,7 +278,7 @@ MediaParserGst::link_to_fakesink(GstPad* pad)
         throw MediaException(_("MediaParserGst: couln't link fakesink"));
     }
     
-    if (!gst_element_set_state (_bin, GST_STATE_PLAYING) == 
GST_STATE_CHANGE_SUCCESS) {
+    if (gst_element_set_state (_bin, GST_STATE_PLAYING) != 
GST_STATE_CHANGE_SUCCESS) {
         throw GnashException(_("MediaParserGst could not change element 
state"));
     }
 }
@@ -334,7 +334,7 @@ MediaParserGst::cb_typefound(GstElement* typefind, guint 
/*probability*/,
     g_signal_connect(demuxer, "no-more-pads", 
             G_CALLBACK(MediaParserGst::cb_no_more_pads), parser);
     
-    if (!gst_element_set_state(parser->_bin, GST_STATE_PLAYING) ==
+    if (gst_element_set_state(parser->_bin, GST_STATE_PLAYING) !=
             GST_STATE_CHANGE_SUCCESS) {
         throw GnashException(_("MediaParserGst could not change "
                     "element state"));
@@ -489,7 +489,7 @@ void MediaParserGst::cb_pad_added(GstElement* /* element 
*/, GstPad* new_pad,
         gst_object_unref(GST_OBJECT(final_pad));
     } 
     
-    if (!gst_element_set_state (parser->_bin, GST_STATE_PLAYING) == 
GST_STATE_CHANGE_SUCCESS) {
+    if (gst_element_set_state (parser->_bin, GST_STATE_PLAYING) != 
GST_STATE_CHANGE_SUCCESS) {
         throw GnashException(_("MediaParserGst could not change element 
state"));
     }
 }

http://git.savannah.gnu.org/cgit//commit/?id=667ce17fe5396c9076b499b23f9cff760e2659dd


commit 667ce17fe5396c9076b499b23f9cff760e2659dd
Author: Bastiaan Jacques <address@hidden>
Date:   Sun Sep 1 13:53:04 2013 +0200

    Remove unused member.

diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index 4af2573..8a6c0f3 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -83,7 +83,6 @@ public:
     // Constructor.
     explicit rw_source_IOChannel(boost::shared_ptr<IOChannel> in)
         :
-        _ownSourceStream(false),
         m_in_stream(in),
         m_start_of_file(true)
     {
@@ -203,8 +202,6 @@ private:
         m_pub.next_input_byte = NULL;
     }
 
-    const bool _ownSourceStream;
-    
     // Source stream
     boost::shared_ptr<IOChannel> m_in_stream;
     bool m_start_of_file;

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

Summary of changes:
 libbase/GnashImageJpeg.cpp           |    3 ---
 libmedia/ffmpeg/VideoDecoderFfmpeg.h |    1 -
 libmedia/gst/MediaParserGst.cpp      |   10 +++++-----
 libsound/EmbedSoundInst.h            |    4 ++--
 4 files changed, 7 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Gnash