rpms/mplayer/devel mplayer-pause.patch, NONE, 1.1 mplayer.spec, 1.37, 1.38

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12130

Modified Files:
	mplayer.spec 
Added Files:
	mplayer-pause.patch 
Log Message:
Fix https://bugzilla.rpmfusion.org/show_bug.cgi?id=1703


mplayer-pause.patch:
 mplayer.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE mplayer-pause.patch ---
commit b2dce9463216e55484918caa553604b44dfd3f11
Author: reimar <reimar at b3059339-0415-0410-9bf9-f77b7e298cf2>
Date:   Fri Apr 15 20:41:40 2011 +0000

    Avoid crash when pausing an audio-only file.
    
    
    git-svn-id: svn://git.mplayerhq.hu/mplayer/trunk@33268 b3059339-0415-0410-9bf9-f77b7e298cf2

diff --git a/mplayer.c b/mplayer.c
index 22d3baf..c946b4a 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2539,7 +2539,8 @@ static void pause_loop(void)
             }
         }
 #endif
-        handle_udp_master(mpctx->sh_video->pts);
+        if (mpctx->sh_video)
+            handle_udp_master(mpctx->sh_video->pts);
         usec_sleep(20000);
     }
     if (cmd && cmd->id == MP_CMD_PAUSE) {


Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mplayer.spec	12 Apr 2011 16:33:04 -0000	1.37
+++ mplayer.spec	29 Jun 2011 19:38:28 -0000	1.38
@@ -6,7 +6,7 @@
 
 Name:           mplayer
 Version:        1.0
-Release:        0.123.%{pre}%{?dist}
+Release:        0.124.%{pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 Group:          Applications/Multimedia
@@ -32,6 +32,8 @@
 Patch14:        %{name}-nodvdcss.patch
 # use system FFmpeg libraries
 Patch18:        %{name}-ffmpeg.patch
+# Upstream fix for http://bugzilla.mplayerhq.hu/show_bug.cgi?id=1904
+Patch19:        %{name}-pause.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -230,6 +232,7 @@
 %patch8 -p1 -b .manlinks
 %patch14 -p1 -b .nodvdcss
 %patch18 -p1 -b .ffmpeg
+%patch19 -p1 -b .pause
 
 doconv() {
     iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -402,6 +405,9 @@
 %{_datadir}/mplayer/*.fp
 
 %changelog
+* Thu Jun 16 2011 Ricky Zhou <ricky at rzhou.org> - 1.0-0.124.20110412svn
+- Add upstream patch for pause crash.
+
 * Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.123.20110412svn
 - 20110412 snapshot
 - drop obsolete libvorbis patch