[SCM] mplayer/master: Refresh patches.
micove-guest at users.alioth.debian.org
micove-guest at users.alioth.debian.org
Tue May 24 15:04:15 UTC 2016
The following commit has been merged in the master branch:
commit 5057ea774b32b674f6d4f8851b8632b2a28dab33
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date: Tue May 24 09:11:34 2016 -0400
Refresh patches.
Gbp-Dch: Ignore
diff --git a/debian/patches/0002_mplayer_debug_printf.patch b/debian/patches/0002_mplayer_debug_printf.patch
index a2784a1..d6f5041 100644
--- a/debian/patches/0002_mplayer_debug_printf.patch
+++ b/debian/patches/0002_mplayer_debug_printf.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/mplayer.c
+++ b/mplayer.c
-@@ -845,7 +845,10 @@ static void exit_sighandler(int x)
+@@ -840,7 +840,10 @@
case SIGSEGV:
mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_Exit_SIGSEGV_SIGFPE);
default:
diff --git a/debian/patches/0100_svn37857_CVE-2016-4352.patch b/debian/patches/0100_svn37857_CVE-2016-4352.patch
index 1296d3a..1d73885 100644
--- a/debian/patches/0100_svn37857_CVE-2016-4352.patch
+++ b/debian/patches/0100_svn37857_CVE-2016-4352.patch
@@ -24,4 +24,3 @@ Debian-Bug: https://bugs.debian.org/823723
// create a new video stream header
sh_video = new_sh_video(demuxer, 0);
-
diff --git a/debian/patches/0200_fix_spelling_error_in_binary.patch b/debian/patches/0200_fix_spelling_error_in_binary.patch
index 52b4517..c65656c 100644
--- a/debian/patches/0200_fix_spelling_error_in_binary.patch
+++ b/debian/patches/0200_fix_spelling_error_in_binary.patch
@@ -3,7 +3,7 @@ Author: Mateusz Łukasik <mati75 at linuxmint.pl>
--- a/stream/dvb_tune.c
+++ b/stream/dvb_tune.c
-@@ -386,7 +386,7 @@ static int tune_it(int fd_frontend, int
+@@ -386,7 +386,7 @@
mp_msg(MSGT_DEMUX, MSGL_V, "tuning DVB-S to Freq: %u, Pol: %c Srate: %d, 22kHz: %s, LNB: %d\n",freq,pol,srate,hi_lo ? "on" : "off", diseqc);
if(do_diseqc(dfd, diseqc, (pol == 'V' ? 1 : 0), hi_lo) == 0)
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list