From f67b07cfd85ed07a6ea536f404aac2a5927c1294 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 13 Jan 2009 06:51:54 +0000 Subject: [PATCH] sys/xvimage/xvimagesink.c: Don't reset the colorkey when element is reused. Fixes #567511. Original commit message from CVS: * sys/xvimage/xvimagesink.c: Don't reset the colorkey when element is reused. Fixes #567511. --- ChangeLog | 5 +++++ sys/xvimage/xvimagesink.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e1e543f051..3186651d76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-13 Stefan Kost + + * sys/xvimage/xvimagesink.c: + Don't reset the colorkey when element is reused. Fixes #567511. + 2009-01-09 Jan Schmidt * configure.ac: diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 4133c27b80..2ba44ea6ad 100644 --- 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; }