[SCM] mplayer packaging branch, karmic, updated. debian/1.0.rc3+svn20090426-1ubuntu10

[siretart at users.alioth.debian.org]

The following commit has been merged in the karmic branch:
commit 7baf6958ca1694b3c689e9e9494ab51fbe6f901b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 7 20:35:33 2009 +0200

    remove 41_use_fontconfig_by_default.patch
    
    this patch is already applied as 24_enable_fontconfig_by_default.diff

diff --git a/debian/patches/41_use_fontconfig_by_default.patch b/debian/patches/41_use_fontconfig_by_default.patch
deleted file mode 100644
index fd88619..0000000
--- a/debian/patches/41_use_fontconfig_by_default.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Author: Reinhard Tartler <siretart at tauware.de>
-Subject: load_fontconfig by default
-Status: Patch taken from upstream.
-
-diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c
-index 20d673a..1cb00b1 100644
---- a/libvo/font_load_ft.c
-+++ b/libvo/font_load_ft.c
-@@ -66,17 +66,17 @@ float subtitle_font_thickness = 2.0;
- // 3 = diagonal
- int subtitle_autoscale = 3;
- 
- int vo_image_width = 0;
- int vo_image_height = 0;
- int force_load_font;
- 
- int using_freetype = 0;
--int font_fontconfig = 0;
-+int font_fontconfig = 1;
- 
- //// constants
- static unsigned int const colors = 256;
- static unsigned int const maxcolor = 255;
- static unsigned const	base = 256;
- static unsigned const first_char = 33;
- #define MAX_CHARSET_SIZE 60000
- 
-

-- 
mplayer packaging