[arch-commits] Commit in xbmc/repos (14 files)
Date: Sunday, May 18, 2014 @ 15:43:16 Author: idevolder Revision: 111419 archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: xbmc/repos/community-testing-i686/ xbmc/repos/community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch (from rev 111418, xbmc/trunk/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch) xbmc/repos/community-testing-i686/PKGBUILD (from rev 111418, xbmc/trunk/PKGBUILD) xbmc/repos/community-testing-i686/enable-external-ffmpeg.patch (from rev 111418, xbmc/trunk/enable-external-ffmpeg.patch) xbmc/repos/community-testing-i686/polkit.rules (from rev 111418, xbmc/trunk/polkit.rules) xbmc/repos/community-testing-i686/xbmc.install (from rev 111418, xbmc/trunk/xbmc.install) xbmc/repos/community-testing-i686/xbmc.service (from rev 111418, xbmc/trunk/xbmc.service) xbmc/repos/community-testing-x86_64/ xbmc/repos/community-testing-x86_64/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch (from rev 111418, xbmc/trunk/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch) xbmc/repos/community-testing-x86_64/PKGBUILD (from rev 111418, xbmc/trunk/PKGBUILD) xbmc/repos/community-testing-x86_64/enable-external-ffmpeg.patch (from rev 111418, xbmc/trunk/enable-external-ffmpeg.patch) xbmc/repos/community-testing-x86_64/polkit.rules (from rev 111418, xbmc/trunk/polkit.rules) xbmc/repos/community-testing-x86_64/xbmc.install (from rev 111418, xbmc/trunk/xbmc.install) xbmc/repos/community-testing-x86_64/xbmc.service (from rev 111418, xbmc/trunk/xbmc.service) --+ community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch | 75 + community-testing-i686/PKGBUILD | 141 ++ community-testing-i686/enable-external-ffmpeg.patch | 100 +++ community-testing-i686/polkit.rules | 12 community-testing-i686/xbmc.install | 28 + community-testing-i686/xbmc.service | 16 + community-testing-x86_64/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch | 75 + community-testing-x86_64/PKGBUILD | 141 ++ community-testing-x86_64/enable-external-ffmpeg.patch | 100 +++ community-testing-x86_64/polkit.rules | 12 community-testing-x86_64/xbmc.install | 28 + community-testing-x86_64/xbmc.service | 16 + 12 files changed, 744 insertions(+) Copied: xbmc/repos/community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch (from rev 111418, xbmc/trunk/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch) === --- community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch (rev 0) +++ community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch 2014-05-18 13:43:16 UTC (rev 111419) @@ -0,0 +1,75 @@ +From a58bcbb0a35ac8e26a880be477705d80ecc5 Mon Sep 17 00:00:00 2001 +From: Jonathan Marshall jmarsh...@xbmc.org +Date: Tue, 6 May 2014 19:40:17 +1200 +Subject: [PATCH 1/7] [rtmp] check m_rtmp for non-NULL - fixes crashes with + missing librtmp + +--- + .../dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp | 16 +++- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp +index b02792a..93fc6f0 100644 +--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp +@@ -104,7 +104,8 @@ CDVDInputStreamRTMP::~CDVDInputStreamRTMP() + m_sStreamPlaying = NULL; + + Close(); +- m_libRTMP.Free(m_rtmp); ++ if (m_rtmp) ++m_libRTMP.Free(m_rtmp); + m_rtmp = NULL; + m_bPaused = false; + } +@@ -139,7 +140,7 @@ bool CDVDInputStreamRTMP::Open(const char* strFile, const std::string content) + m_sStreamPlaying = NULL; + } + +- if (!CDVDInputStream::Open(strFile, video/x-flv)) ++ if (!m_rtmp || !CDVDInputStream::Open(strFile, video/x-flv)) + return false; + + CSingleLock lock(m_RTMPSection); +@@ -181,7 +182,8 @@ void CDVDInputStreamRTMP::Close() + CSingleLock lock(m_RTMPSection); + CDVDInputStream::Close(); + +- m_libRTMP.Close(m_rtmp); ++ if (m_rtmp) ++
[arch-commits] Commit in xbmc/repos (14 files)
Date: Sunday, May 11, 2014 @ 17:00:28 Author: idevolder Revision: 110975 archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: xbmc/repos/community-testing-i686/ xbmc/repos/community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch (from rev 110974, xbmc/trunk/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch) xbmc/repos/community-testing-i686/PKGBUILD (from rev 110974, xbmc/trunk/PKGBUILD) xbmc/repos/community-testing-i686/enable-external-ffmpeg.patch (from rev 110974, xbmc/trunk/enable-external-ffmpeg.patch) xbmc/repos/community-testing-i686/polkit.rules (from rev 110974, xbmc/trunk/polkit.rules) xbmc/repos/community-testing-i686/xbmc.install (from rev 110974, xbmc/trunk/xbmc.install) xbmc/repos/community-testing-i686/xbmc.service (from rev 110974, xbmc/trunk/xbmc.service) xbmc/repos/community-testing-x86_64/ xbmc/repos/community-testing-x86_64/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch (from rev 110974, xbmc/trunk/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch) xbmc/repos/community-testing-x86_64/PKGBUILD (from rev 110974, xbmc/trunk/PKGBUILD) xbmc/repos/community-testing-x86_64/enable-external-ffmpeg.patch (from rev 110974, xbmc/trunk/enable-external-ffmpeg.patch) xbmc/repos/community-testing-x86_64/polkit.rules (from rev 110974, xbmc/trunk/polkit.rules) xbmc/repos/community-testing-x86_64/xbmc.install (from rev 110974, xbmc/trunk/xbmc.install) xbmc/repos/community-testing-x86_64/xbmc.service (from rev 110974, xbmc/trunk/xbmc.service) --+ community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch | 75 + community-testing-i686/PKGBUILD | 141 ++ community-testing-i686/enable-external-ffmpeg.patch | 100 +++ community-testing-i686/polkit.rules | 12 community-testing-i686/xbmc.install | 19 + community-testing-i686/xbmc.service | 16 + community-testing-x86_64/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch | 75 + community-testing-x86_64/PKGBUILD | 141 ++ community-testing-x86_64/enable-external-ffmpeg.patch | 100 +++ community-testing-x86_64/polkit.rules | 12 community-testing-x86_64/xbmc.install | 19 + community-testing-x86_64/xbmc.service | 16 + 12 files changed, 726 insertions(+) Copied: xbmc/repos/community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch (from rev 110974, xbmc/trunk/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch) === --- community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch (rev 0) +++ community-testing-i686/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch 2014-05-11 15:00:28 UTC (rev 110975) @@ -0,0 +1,75 @@ +From a58bcbb0a35ac8e26a880be477705d80ecc5 Mon Sep 17 00:00:00 2001 +From: Jonathan Marshall jmarsh...@xbmc.org +Date: Tue, 6 May 2014 19:40:17 +1200 +Subject: [PATCH 1/7] [rtmp] check m_rtmp for non-NULL - fixes crashes with + missing librtmp + +--- + .../dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp | 16 +++- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp +index b02792a..93fc6f0 100644 +--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp +@@ -104,7 +104,8 @@ CDVDInputStreamRTMP::~CDVDInputStreamRTMP() + m_sStreamPlaying = NULL; + + Close(); +- m_libRTMP.Free(m_rtmp); ++ if (m_rtmp) ++m_libRTMP.Free(m_rtmp); + m_rtmp = NULL; + m_bPaused = false; + } +@@ -139,7 +140,7 @@ bool CDVDInputStreamRTMP::Open(const char* strFile, const std::string content) + m_sStreamPlaying = NULL; + } + +- if (!CDVDInputStream::Open(strFile, video/x-flv)) ++ if (!m_rtmp || !CDVDInputStream::Open(strFile, video/x-flv)) + return false; + + CSingleLock lock(m_RTMPSection); +@@ -181,7 +182,8 @@ void CDVDInputStreamRTMP::Close() + CSingleLock lock(m_RTMPSection); + CDVDInputStream::Close(); + +- m_libRTMP.Close(m_rtmp); ++ if (m_rtmp) ++
