[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderGst.cpp [release
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderGst.cpp [release_0_8_1] |
Date: |
Tue, 21 Aug 2007 17:14:26 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_8_1
Changes by: Sandro Santilli <strk> 07/08/21 17:14:26
Modified files:
. : ChangeLog
libbase : embedVideoDecoderGst.cpp
Log message:
* libbase/embedVideoDecoderGst.cpp (createDecoder): don't
abort if outputFormat is NONE (renderer missing).
Fixes bug bug #20852.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.50&r2=1.3971.2.51
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderGst.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.9&r2=1.9.2.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.50
retrieving revision 1.3971.2.51
diff -u -b -r1.3971.2.50 -r1.3971.2.51
--- ChangeLog 21 Aug 2007 15:26:20 -0000 1.3971.2.50
+++ ChangeLog 21 Aug 2007 17:14:25 -0000 1.3971.2.51
@@ -1,3 +1,9 @@
+2007-08-21 Sandro Santilli <address@hidden>
+
+ * libbase/embedVideoDecoderGst.cpp (createDecoder): don't
+ abort if outputFormat is NONE (renderer missing).
+ Fixes bug bug #20852.
+
2007-08-21 Benjamin Wolsey <address@hidden>
* configure.ac: look for getpwnam
Index: libbase/embedVideoDecoderGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderGst.cpp,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- libbase/embedVideoDecoderGst.cpp 23 Jul 2007 22:09:49 -0000 1.9
+++ libbase/embedVideoDecoderGst.cpp 21 Aug 2007 17:14:26 -0000 1.9.2.1
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-// $Id: embedVideoDecoderGst.cpp,v 1.9 2007/07/23 22:09:49 strk Exp $
+// $Id: embedVideoDecoderGst.cpp,v 1.9.2.1 2007/08/21 17:14:26 strk Exp $
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -121,10 +121,14 @@
videocaps = gst_element_factory_make ("capsfilter", NULL);
if (outputFormat == YUV) {
caps = gst_caps_new_simple ("video/x-raw-yuv", NULL);
- } else {
- assert(outputFormat == RGB);
+ } else if ( outputFormat == RGB ) {
caps = gst_caps_new_simple ("video/x-raw-rgb", NULL);
}
+ else
+ {
+ assert(outputFormat == NONE);
+ return; // nothing to do, right ? TODO: some cleanup ?
+ }
assert(caps); // ok, this is a silly assertion *now*, but as long as
// the code is implemented with such long function bodies
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderGst.cpp [release_0_8_1],
Sandro Santilli <=