[Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderGst.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/21 17:12:42

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&r1=1.4060&r2=1.4061
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderGst.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4060
retrieving revision 1.4061
diff -u -b -r1.4060 -r1.4061
--- ChangeLog   21 Aug 2007 15:18:35 -0000      1.4060
+++ ChangeLog   21 Aug 2007 17:12:41 -0000      1.4061
@@ -1,3 +1,9 @@
+2007-08-21 Sandro Santilli <[EMAIL PROTECTED]>
+
+       * libbase/embedVideoDecoderGst.cpp (createDecoder): don't
+         abort if outputFormat is NONE (renderer missing).
+         Fixes bug bug #20852.
+
 2007-08-21 Benjamin Wolsey <[EMAIL PROTECTED]>
 
        * 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.10
diff -u -b -r1.9 -r1.10
--- libbase/embedVideoDecoderGst.cpp    23 Jul 2007 22:09:49 -0000      1.9
+++ libbase/embedVideoDecoderGst.cpp    21 Aug 2007 17:12:42 -0000      1.10
@@ -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.10 2007/08/21 17:12:42 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


_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit