[SCM] mplayer packaging branch, master.experimental, updated. debian/1.0.rc3++final-0ubuntu2-10-g655d595

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 655d5959ffdb2375245cf1f43c4f33b7c721721d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 10 22:38:07 2010 -0400

    add forgotten BGR15 format to fmt-conversion.c table

diff --git a/debian/patches/24forgotten-bgr15-format.patch b/debian/patches/24forgotten-bgr15-format.patch
new file mode 100644
index 0000000..4b663c9
--- /dev/null
+++ b/debian/patches/24forgotten-bgr15-format.patch
@@ -0,0 +1,14 @@
+From: Reimar
+Subject: 100l, add forgotten BGR15 format to fmt-conversion.c table
+Origin: upstream, r29117, http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2009-April/036930.html
+
+--- a/fmt-conversion.c
++++ b/fmt-conversion.c
+@@ -28,6 +28,7 @@ static const struct {
+     {IMGFMT_BGR32, PIX_FMT_RGB32},
+     {IMGFMT_BGR24, PIX_FMT_BGR24},
+     {IMGFMT_BGR16, PIX_FMT_RGB565},
++    {IMGFMT_BGR15, PIX_FMT_RGB555},
+     {IMGFMT_BGR8,  PIX_FMT_RGB8},
+     {IMGFMT_BGR4,  PIX_FMT_RGB4},
+     {IMGFMT_BGR1,  PIX_FMT_MONOBLACK},
diff --git a/debian/patches/series b/debian/patches/series
index 31ac392..d0400e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 11configure-mktemp.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
+24forgotten-bgr15-format.patch

-- 
mplayer packaging