[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
From: |
Bastiaan Jacques |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1444-g2f077c6 |
Date: |
Sun, 25 Mar 2012 18:54:23 +0000 |
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 2f077c6bb2ecffd4061d432cc28dc2dbc9ff0aa5 (commit)
from 27da93812de1648a2f52c27689a1bfb94224187d (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=2f077c6bb2ecffd4061d432cc28dc2dbc9ff0aa5
commit 2f077c6bb2ecffd4061d432cc28dc2dbc9ff0aa5
Author: Bastiaan Jacques <address@hidden>
Date: Sun Mar 25 20:50:29 2012 +0200
Bug #34702. Resetting the stream to the previous state is not
appropriate; don't resend frames.
diff --git a/libmedia/gst/MediaParserGst.cpp b/libmedia/gst/MediaParserGst.cpp
index 063ac4b..f6040f0 100644
--- a/libmedia/gst/MediaParserGst.cpp
+++ b/libmedia/gst/MediaParserGst.cpp
@@ -198,10 +198,11 @@ MediaParserGst::pushGstBuffer()
GstFlowReturn rv = gst_pad_push (_srcpad, buffer);
if (!GST_FLOW_IS_SUCCESS (rv)) {
- log_error(_("MediaParserGst failed to push more data into the demuxer!
"
- "Seeking back."));
- _stream->seek(_stream->tell() - ret);
- return false;
+ // This is not (necessarily) an error situation, because some streams
+ // contain garbage. However, Gstreamer will continue accepting new
+ // frames.
+ log_debug(_("MediaParserGst failed to push more data into the
demuxer."));
+ return true;
}
return true;
-----------------------------------------------------------------------
Summary of changes:
libmedia/gst/MediaParserGst.cpp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1444-g2f077c6,
Bastiaan Jacques <=