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

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f040ce868df33a5b447d7066c6ed0f082e509598
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 16 07:38:37 2009 +0100

    import svn revision r28803, fixes #519680
    
    remove a pointless opt = NULL assignment that made print_int crash since
    r28794. Patch taken upstream and can be dropped on the next upstream sync

diff --git a/debian/patches/50_r28803_segfault_print_int.patch b/debian/patches/50_r28803_segfault_print_int.patch
new file mode 100644
index 0000000..ef1f89a
--- /dev/null
+++ b/debian/patches/50_r28803_segfault_print_int.patch
@@ -0,0 +1,17 @@
+------------------------------------------------------------------------
+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 8a7fe5b..38f715b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
 30link-system-ffmpeg.patch
+50_r28803_segfault_print_int.patch

-- 
mplayer packaging