[Gnash-commit] [SCM] Gnash branch, master, updated. 1b68dac7fb05d3b529fa127ad4eb738dd9f0a36b

[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  1b68dac7fb05d3b529fa127ad4eb738dd9f0a36b (commit)
      from  ee36c59bdf5ff5964629e6f43326167fdcc9b100 (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=1b68dac7fb05d3b529fa127ad4eb738dd9f0a36b


commit 1b68dac7fb05d3b529fa127ad4eb738dd9f0a36b
Author: Sandro Santilli <address@hidden>
Date:   Mon Nov 22 17:41:15 2010 +0100

    Do not log an error for missing Video info in DefineVideo, as that's fine 
when Vide is being created by ActionScript or intentionally w/out data just to 
use with NetStream

diff --git a/libcore/Video.cpp b/libcore/Video.cpp
index 7118269..9ec56bf 100644
--- a/libcore/Video.cpp
+++ b/libcore/Video.cpp
@@ -75,10 +75,7 @@ Video::Video(as_object* object,
        }
 
        media::VideoInfo* info = m_def->getVideoInfo();
-       if (!info) {
-               log_error(_("No Video info in video definition"));
-               return;
-       }
+       if (!info) return;
 
     try {
            _decoder = mh->createVideoDecoder(*info);
@@ -156,7 +153,10 @@ Video::getVideoFrame()
         // Don't try to do anything if there is no decoder. If it was
         // never constructed (most likely), we'll return nothing,
         // otherwise the last decoded frame.
-        if (!_decoder.get()) return _lastDecodedVideoFrame.get();
+        if (!_decoder.get()) {
+                   LOG_ONCE( log_error(_("No Video info in video definition")) 
);
+            return _lastDecodedVideoFrame.get();
+        }
 
                int current_frame = get_ratio(); 
 
diff --git a/libcore/Video.h b/libcore/Video.h
index 35e177e..7b1c97a 100644
--- a/libcore/Video.h
+++ b/libcore/Video.h
@@ -127,8 +127,12 @@ private:
        /// Last decoded frame 
        std::auto_ptr<image::GnashImage> _lastDecodedVideoFrame;
 
-       /// The decoder used to decode the video frames
-       std::auto_ptr<media::VideoDecoder> _decoder;
+    /// The decoder used to decode the video frames for embedded streams
+    //
+    /// For dynamically loaded videos NetStream takes care of decoding
+    /// see the _ns property
+    ///
+    std::auto_ptr<media::VideoDecoder> _decoder;
 
     /// Whether to request smoothing when the video is scaled
     bool _smoothing;

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

Summary of changes:
 libcore/Video.cpp |   10 +++++-----
 libcore/Video.h   |    8 ++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash