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

[Benjamin Wolsey]

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  e99834c1cb224b7ed306d1708fa9bf32e2f15916 (commit)
       via  93d7c0015c58e384343c0be96721e66022cb0bd6 (commit)
       via  947cfd8e3cc521b257e67c1ea9e7241666bbbb7d (commit)
       via  0e37d7f09c088e44c5f00ce258344b319ae085dc (commit)
       via  54e77e3db62cfd2d647964a6619bb7cc8ccadb2e (commit)
      from  e7606177a6c4c5e7a7ab4c085a7328671ca9ff24 (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=e99834c1cb224b7ed306d1708fa9bf32e2f15916


commit e99834c1cb224b7ed306d1708fa9bf32e2f15916
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Dec 8 16:50:34 2010 +0100

    Header order.

diff --git a/libbase/RTMP.cpp b/libbase/RTMP.cpp
index a331f80..eca22ca 100644
--- a/libbase/RTMP.cpp
+++ b/libbase/RTMP.cpp
@@ -15,14 +15,13 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#include "RTMP.h"
+
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
 #include <cstdio>
 #include <boost/lexical_cast.hpp>
-
-#include "GnashSystemNetHeaders.h"
-
 // Replace!!
 #ifndef _WIN32
 # include <sys/times.h>
@@ -31,7 +30,7 @@
 # include <ctime>
 #endif
 
-#include "RTMP.h"
+#include "GnashSystemNetHeaders.h"
 #include "log.h"
 #include "AMF.h"
 #include "GnashAlgorithm.h"

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


commit 93d7c0015c58e384343c0be96721e66022cb0bd6
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Dec 8 16:30:26 2010 +0100

    Header order.

diff --git a/libcore/asobj/Array_as.cpp b/libcore/asobj/Array_as.cpp
index 4ade499..e539723 100644
--- a/libcore/asobj/Array_as.cpp
+++ b/libcore/asobj/Array_as.cpp
@@ -18,9 +18,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#include "Array_as.h"
+
+#include <string>
+#include <algorithm>
+#include <cmath>
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/lexical_cast.hpp>
+
 #include "smart_ptr.h" // GNASH_USE_GC
 #include "as_value.h"
-#include "Array_as.h"
 #include "log.h"
 #include "builtin_function.h"
 #include "NativeFunction.h" 
@@ -32,35 +39,29 @@
 #include "GnashNumeric.h"
 #include "namedStrings.h"
 
-#include <string>
-#include <algorithm>
-#include <cmath>
-#include <boost/algorithm/string/case_conv.hpp>
-#include <boost/lexical_cast.hpp>
-
 namespace gnash {
 
 // Forward declarations
 namespace {
        
-/// Sort flags
-enum SortFlags {
-    /// Case-insensitive (z precedes A)
-    SORT_CASE_INSENSITIVE = (1<<0), // 1
-    /// Descending order (b precedes a)
-    SORT_DESCENDING    = (1<<1), // 2
-    /// If two or more elements in the array
-    /// have identical sort fields, return 0
-    /// and don't modify the array.
-    /// Otherwise proceed to sort the array.
-    SORT_UNIQUE        = (1<<2), // 4
-    /// Don't modify the array, rather return
-    /// a new array containing indexes into it
-    /// in sorted order.
-    SORT_RETURN_INDEX = (1<<3), // 8
-    /// Numerical sort (9 precedes 10)
-    SORT_NUMERIC = (1<<4) // 16
-};
+    /// Sort flags
+    enum SortFlags {
+        /// Case-insensitive (z precedes A)
+        SORT_CASE_INSENSITIVE = (1<<0), // 1
+        /// Descending order (b precedes a)
+        SORT_DESCENDING        = (1<<1), // 2
+        /// If two or more elements in the array
+        /// have identical sort fields, return 0
+        /// and don't modify the array.
+        /// Otherwise proceed to sort the array.
+        SORT_UNIQUE    = (1<<2), // 4
+        /// Don't modify the array, rather return
+        /// a new array containing indexes into it
+        /// in sorted order.
+        SORT_RETURN_INDEX = (1<<3), // 8
+        /// Numerical sort (9 precedes 10)
+        SORT_NUMERIC = (1<<4) // 16
+    };
 
     struct indexed_as_value;
 

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


commit 947cfd8e3cc521b257e67c1ea9e7241666bbbb7d
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Dec 8 16:26:50 2010 +0100

    Header order.

diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
index 58d9176..737e17e 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
@@ -21,16 +21,16 @@
 #include "gnashconfig.h"
 #endif
 
-#include "ffmpegHeaders.h"
 #include "VideoDecoderFfmpeg.h"
-#include "MediaParserFfmpeg.h" // for ExtraVideoInfoFfmpeg 
-#include "GnashException.h" // for MediaException
-#include "utility.h"
 
 #include <boost/scoped_array.hpp>
 #include <boost/format.hpp>
 #include <algorithm>
 
+#include "ffmpegHeaders.h"
+#include "MediaParserFfmpeg.h" // for ExtraVideoInfoFfmpeg 
+#include "GnashException.h" // for MediaException
+#include "utility.h"
 #include "FLVParser.h"
 
 #ifdef HAVE_VA_VA_H
@@ -47,8 +47,6 @@ class VaapiContextFfmpeg;
 
 // Forward declarations of VAAPI functions.
 namespace {
-
-
     VaapiContextFfmpeg* get_vaapi_context(AVCodecContext* avctx);
     void set_vaapi_context(AVCodecContext* avctx, VaapiContextFfmpeg* vactx);
     void clear_vaapi_context(AVCodecContext* avctx);
@@ -60,6 +58,7 @@ namespace {
 }
 
 #ifdef HAVE_SWSCALE_H
+
 /// A wrapper round an SwsContext that ensures it's
 /// freed on destruction.
 class SwsContextWrapper

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


commit 0e37d7f09c088e44c5f00ce258344b319ae085dc
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Dec 8 16:25:19 2010 +0100

    Drop incorrect ifdef markers.

diff --git a/libmedia/AudioDecoder.h b/libmedia/AudioDecoder.h
index c890250..e5ce677 100644
--- a/libmedia/AudioDecoder.h
+++ b/libmedia/AudioDecoder.h
@@ -16,7 +16,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-
 #ifndef GNASH_AUDIODECODER_H
 #define GNASH_AUDIODECODER_H
 
@@ -90,13 +89,17 @@ public:
 inline boost::uint8_t*
 AudioDecoder::decode(const boost::uint8_t*, boost::uint32_t, boost::uint32_t&,
         boost::uint32_t&, bool)
-{ return 0; }
+{
+    return 0;
+}
 
 inline boost::uint8_t*
 AudioDecoder::decode(const EncodedAudioFrame&, boost::uint32_t&)
-{ return 0; }
+{
+    return 0;
+}
        
 } // gnash.media namespace 
 } // gnash namespace
 
-#endif // __AUDIODECODER_H__
+#endif 
diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.h 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.h
index 01460cf..ef12300 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.h
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.h
@@ -16,7 +16,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-
 #ifndef GNASH_AUDIODECODERFFMPEG_H
 #define GNASH_AUDIODECODERFFMPEG_H
 
@@ -107,4 +106,4 @@ private:
 } // gnash.media namespace 
 } // gnash namespace
 
-#endif // __AUDIODECODERFFMPEG_H__
+#endif 

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


commit 54e77e3db62cfd2d647964a6619bb7cc8ccadb2e
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Dec 8 16:24:05 2010 +0100

    Break long lines.

diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index 5dfd478..d448760 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -17,16 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-
 #include "AudioDecoderFfmpeg.h"
+
+#include <cmath> // for std::ceil
+#include <algorithm> // for std::copy, std::max
+
 #include "MediaParserFfmpeg.h" // for ExtraAudioInfoFfmpeg
 #include "FLVParser.h"
 #include "SoundInfo.h"
 #include "MediaParser.h" // for AudioInfo
 
-#include <cmath> // for std::ceil
-#include <algorithm> // for std::copy, std::max
-
 //#define GNASH_DEBUG_AUDIO_DECODING
 
 #define AVCODEC_DECODE_AUDIO avcodec_decode_audio2
diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.h 
b/libmedia/ffmpeg/AudioDecoderFfmpeg.h
index 2b8558f..01460cf 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.h
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.h
@@ -56,16 +56,20 @@ public:
        ~AudioDecoderFfmpeg();
 
     // See dox in AudioDecoder.h
-       boost::uint8_t* decode(const boost::uint8_t* input, boost::uint32_t 
inputSize, boost::uint32_t& outputSize, boost::uint32_t& decodedBytes, bool 
parse);
+       boost::uint8_t* decode(const boost::uint8_t* input,
+            boost::uint32_t inputSize, boost::uint32_t& outputSize,
+            boost::uint32_t& decodedBytes, bool parse);
 
-       boost::uint8_t* decode(const EncodedAudioFrame& af, boost::uint32_t& 
outputSize);
+       boost::uint8_t* decode(const EncodedAudioFrame& af,
+            boost::uint32_t& outputSize);
 
 private:
 
        void setup(const AudioInfo& info);
        void setup(SoundInfo& info);
 
-       boost::uint8_t* decodeFrame(const boost::uint8_t* input, 
boost::uint32_t inputSize, boost::uint32_t& outputSize);
+       boost::uint8_t* decodeFrame(const boost::uint8_t* input,
+            boost::uint32_t inputSize, boost::uint32_t& outputSize);
 
        AVCodec* _audioCodec;
        AVCodecContext* _audioCodecCtx;

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

Summary of changes:
 libbase/RTMP.cpp                       |    7 ++--
 libcore/asobj/Array_as.cpp             |   51 ++++++++++++++++---------------
 libmedia/AudioDecoder.h                |   11 ++++--
 libmedia/ffmpeg/AudioDecoderFfmpeg.cpp |    8 ++--
 libmedia/ffmpeg/AudioDecoderFfmpeg.h   |   13 +++++---
 libmedia/ffmpeg/VideoDecoderFfmpeg.cpp |   11 +++----
 6 files changed, 53 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
Gnash