[SCM] mplayer packaging branch, master, updated. debian/1.0.rc2+svn20090303-2-40-g0066f18

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a2211747383b1a980162cffdba9d789f30f13f57
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 5 11:22:35 2009 +0200

    remove patch 50_r28803_segfault_print_int.patch
    
    merged upstream

diff --git a/debian/patches/50_r28803_segfault_print_int.patch b/debian/patches/50_r28803_segfault_print_int.patch
deleted file mode 100644
index ef1f89a..0000000
--- a/debian/patches/50_r28803_segfault_print_int.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-------------------------------------------------------------------------
-r28803 | reimar | 2009-03-03 19:12:03 +0100 (Di, 03. Mär 2009) | 2 lines
-
-100l, remove a pointless opt = NULL assignment that made print_int crash since r28794
-
-------------------------------------------------------------------------
-
---- mplayer-trunk/m_option.c	(Revision 28802)
-+++ mplayer-trunk/m_option.c	(Revision 28803)
-@@ -173,7 +173,6 @@
- }
- 
- static char* print_int(const m_option_t* opt,  const void* val) {
--  opt = NULL;
-   if (opt->type->size == sizeof(int64_t))
-     return dup_printf("%"PRId64, *(const int64_t *)val);
-   return dup_printf("%d",VAL(val));
diff --git a/debian/patches/series b/debian/patches/series
index 58f683f..31ac392 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 11configure-mktemp.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
-50_r28803_segfault_print_int.patch

-- 
mplayer packaging