Bug#308266: NMU diff for -2sarge.0.1

[Jordi Mallach]

Hi David,

On request of the Release Team, I uploaded an NMU to tpu with your
recent changes to unstable.

Here's the diff. You probably don't need to worry at all, because all
the changes were done by you already.

Attached is the diff.

Jordi
-- 
Jordi Mallach Pérez  --  Debian developer     http://www.debian.org/
[EMAIL PROTECTED]     [EMAIL PROTECTED]     http://www.sindominio.net/
GnuPG public key information available at http://oskuro.net/

diff -u swfdec0.3-0.3.4/debian/changelog swfdec0.3-0.3.4/debian/changelog
--- swfdec0.3-0.3.4/debian/changelog
+++ swfdec0.3-0.3.4/debian/changelog
@@ -1,3 +1,14 @@
+swfdec0.3 (0.3.4-2sarge0.1) testing-proposed-updates; urgency=low
+
+  * Non-maintainer upload.
+  * Backport changes to 0.3.4-3 from unstable, that can't go in
+    testing due to being blocked by other dependencies:
+    + Add a colorspace element to the pipeline in swfdec-mozilla-player,
+      since not everyone has a Visual that matches swfdec's colorspace.
+      (Closes: #308266)
+
+ -- Jordi Mallach <[EMAIL PROTECTED]>  Wed, 18 May 2005 09:47:50 +0200
+
 swfdec0.3 (0.3.4-2) unstable; urgency=low
 
   * The Mozilla plugin changed name, so it's necessary to change the
only in patch2:
unchanged:
--- swfdec0.3-0.3.4.orig/plugin/swfdec-mozilla-player.c
+++ swfdec0.3-0.3.4/plugin/swfdec-mozilla-player.c
@@ -119,6 +119,7 @@
 static GstElement *audioconvert;
 static GstElement *audioscale;
 static GstElement *audio_sink;
+static GstElement *colorspace;
 static GstElement *video_sink;
 static GstElement *xoverlay;
 
@@ -274,6 +275,12 @@
     exit(1);
   }
 
+  colorspace = gst_element_factory_make ("ffmpegcolorspace", NULL);
+  if (colorspace == NULL) {
+    fprintf(stderr, "Could not create ffmpegcolorspace element\n");
+    exit(1);
+  }
+
   video_sink = gst_element_factory_make ("ximagesink", NULL);
   if (video_sink == NULL) {
     fprintf(stderr, "Could not create video sink (ximagesink)\n");
@@ -291,11 +298,12 @@
   gst_bin_add_many (GST_BIN (thread), src, swfdec, thread2, thread3, NULL);
   gst_bin_add_many (GST_BIN (thread2), queue1, audioconvert, audioscale,
       audio_sink, NULL);
-  gst_bin_add_many (GST_BIN (thread3), queue2, video_sink, NULL);
+  gst_bin_add_many (GST_BIN (thread3), queue2, colorspace, video_sink, NULL);
 
   ret = gst_element_link (src, swfdec);
   ret &= gst_element_link (swfdec, queue2);
-  ret &= gst_element_link (queue2, video_sink);
+  ret &= gst_element_link (queue2, colorspace);
+  ret &= gst_element_link (colorspace, video_sink);
   ret &= gst_element_link (swfdec, queue1);
   ret &= gst_element_link (queue1, audioscale);
   ret &= gst_element_link (audioscale, audioconvert);

signature.asc
Description: Digital signature