[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1761-g663000b

[Gabriele Giacone]

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  663000b705e92d4f16e53a35c830f2b1c2208700 (commit)
       via  186b8d338e3a21ed76ac3a6ab77d78b5fe20bf86 (commit)
      from  9d14acb46f2b59b9dbdb96932e52e848b8500202 (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=663000b705e92d4f16e53a35c830f2b1c2208700


commit 663000b705e92d4f16e53a35c830f2b1c2208700
Author: Gabriele Giacone <address@hidden>
Date:   Thu Aug 22 19:47:15 2013 +0200

    Add missing CODECID define for vaapi. Thanks chithead.

diff --git a/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.h 
b/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.h
index d9d1ee3..25e8a95 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.h
+++ b/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.h
@@ -29,6 +29,12 @@ extern "C" {
 #include <libavcodec/vaapi.h>
 }
 
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,18,102)
+#define CODECID AVCodecID
+#else
+#define CODECID CodecID
+#endif
+
 namespace gnash {
 namespace media {
 namespace ffmpeg {

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


commit 186b8d338e3a21ed76ac3a6ab77d78b5fe20bf86
Author: Gabriele Giacone <address@hidden>
Date:   Thu Aug 22 19:45:16 2013 +0200

    Keep dropping unused code. See 9d14acb4.

diff --git a/libmedia/gst/MediaParserGst.cpp b/libmedia/gst/MediaParserGst.cpp
index 7da2e2f..b7bcf52 100644
--- a/libmedia/gst/MediaParserGst.cpp
+++ b/libmedia/gst/MediaParserGst.cpp
@@ -229,11 +229,6 @@ MediaParserGst::rememberVideoFrame(EncodedVideoFrame* 
frame)
 ///   demuxer has signaled "no more pads", or when the first video and
 ///   audio streams have been found.
 
-bool MediaParserGst::foundAllStreams()
-{
-    return _demux_probe_ended || (_videoInfo.get() && _audioInfo.get());
-}
-
 static void
 print_caps(GstCaps* caps)
 {
diff --git a/libmedia/gst/MediaParserGst.h b/libmedia/gst/MediaParserGst.h
index 5970d0e..a6e47d5 100644
--- a/libmedia/gst/MediaParserGst.h
+++ b/libmedia/gst/MediaParserGst.h
@@ -128,8 +128,6 @@ public:
     void rememberVideoFrame(EncodedVideoFrame* frame);
 
 private:
-    bool foundAllStreams();
-
     void link_to_fakesink(GstPad* pad);
 
     static void cb_typefound (GstElement *typefind, guint probability,

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

Summary of changes:
 libmedia/ffmpeg/VideoDecoderFfmpegVaapi.h |    6 ++++++
 libmedia/gst/MediaParserGst.cpp           |    5 -----
 libmedia/gst/MediaParserGst.h             |    2 --
 3 files changed, 6 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash