sys/xvimage/xvimagesink.c: Don't reset the colorkey when element is reused. Fixes...

Original commit message from CVS:
* sys/xvimage/xvimagesink.c:
Don't reset the colorkey when element is reused. Fixes #567511.

diff --git a/ChangeLog b/ChangeLog
index e1e543f..3186651 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-13  Stefan Kost  <ensonic@users.sf.net>
+
+       * sys/xvimage/xvimagesink.c:
+         Don't reset the colorkey when element is reused. Fixes #567511.
+
 2009-01-09  Jan Schmidt  <jan.schmidt@sun.com>
 
        * configure.ac:

diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 4133c27..2ba44ea 100644 (file)
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -3145,8 +3145,6 @@ gst_xvimagesink_reset (GstXvImageSink * xvimagesink)
   }
 
   gst_xvimagesink_xcontext_clear (xvimagesink);
-
-  xvimagesink->colorkey = -1;
 }
 
 /* Finalize is called only once, dispose can be called multiple times.
@@ -3220,7 +3218,7 @@ gst_xvimagesink_init (GstXvImageSink * xvimagesink)
   xvimagesink->handle_expose = TRUE;
   xvimagesink->autopaint_colorkey = TRUE;
 
-  xvimagesink->colorkey = (1 << 16) | (2 << 8) | 3;;
+  xvimagesink->colorkey = (1 << 16) | (2 << 8) | 3;
   xvimagesink->draw_borders = TRUE;
 }