[SCM] mplayer/master: Cherry pick r37548 from the 1.2 branch to fix a segmentation fault.

[micove-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 54ec8d20d0663e14995ffcf4c2d9fa13c0c22f00
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Mon Oct 19 03:43:56 2015 -0400

    Cherry pick r37548 from the 1.2 branch to fix a segmentation fault.
    
    This is also the only commit in the branch after the release.

diff --git a/debian/patches/0101_svn37548.patch b/debian/patches/0101_svn37548.patch
new file mode 100644
index 0000000..e9336b6
--- /dev/null
+++ b/debian/patches/0101_svn37548.patch
@@ -0,0 +1,20 @@
+Description: Add revision 37548 from the 1.2 branch.
+ Fix segmentation fault.
+ .
+ For DVD iso images, there is no guiInfo.Filename.
+Author: Ingo Brückl <ib at wupperonline.de>
+Forwarded: not-needed
+
+Index: mplayer/gui/interface.c
+===================================================================
+--- mplayer/gui/interface.c	(revision 37538)
++++ mplayer/gui/interface.c	(revision 37548)
+@@ -507,7 +507,7 @@
+             force_fps = 0;
+         }
+ 
+-        if (gstrcmp(strrchr(guiInfo.Filename, '.'), ".cue") == 0)
++        if (guiInfo.Filename && (gstrcmp(strrchr(guiInfo.Filename, '.'), ".cue") == 0))
+             guiInfo.StreamType = STREAMTYPE_BINCUE;
+ 
+         switch (guiInfo.StreamType) {
diff --git a/debian/patches/series b/debian/patches/series
index e20c38d..06c73b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 0001_version.patch
 0002_mplayer_debug_printf.patch
 0100_svn37545.patch
+0101_svn37548.patch
 0200_Hurd_PATH_MAX.patch
 0201_PATH_MAX_HURD.patch

-- 
mplayer packaging