[SCM] liblivemedia/master: Refresh all patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Apr 23 23:12:21 UTC 2012


The following commit has been merged in the master branch:
commit 0a273a7a9e4690f5ae4700eaec6e35f82b12f1eb
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 24 01:11:55 2012 +0200

    Refresh all patches.

diff --git a/debian/patches/020_invalid_casts.diff b/debian/patches/020_invalid_casts.diff
index 167eba3..fc31d6d 100644
--- a/debian/patches/020_invalid_casts.diff
+++ b/debian/patches/020_invalid_casts.diff
@@ -3,9 +3,9 @@
  liveMedia/MPEG1or2Demux.cpp        |    4 ++--
  2 files changed, 3 insertions(+), 3 deletions(-)
 
---- a/liveMedia/MPEG1or2Demux.cpp
-+++ b/liveMedia/MPEG1or2Demux.cpp
-@@ -161,7 +161,7 @@
+--- liblivemedia.orig/liveMedia/MPEG1or2Demux.cpp
++++ liblivemedia/liveMedia/MPEG1or2Demux.cpp
+@@ -161,7 +161,7 @@ void MPEG1or2Demux::registerReadInterest
    // Make sure this stream is not already being read:
    if (out.isCurrentlyAwaitingData) {
      envir() << "MPEG1or2Demux::registerReadInterest(): attempt to read stream id "
@@ -14,7 +14,7 @@
      envir().internalError();
    }
  
-@@ -460,7 +460,7 @@
+@@ -460,7 +460,7 @@ void MPEGProgramStreamParser::parsePackH
      skipBytes(pack_stuffing_length);
    } else { // unknown
      fUsingDemux->envir() << "StreamParser::parsePack() saw strange byte "
@@ -23,9 +23,9 @@
  			  << " following pack_start_code\n";
    }
  
---- a/liveMedia/H263plusVideoRTPSink.cpp
-+++ b/liveMedia/H263plusVideoRTPSink.cpp
-@@ -64,7 +64,7 @@
+--- liblivemedia.orig/liveMedia/H263plusVideoRTPSink.cpp
++++ liblivemedia/liveMedia/H263plusVideoRTPSink.cpp
+@@ -64,7 +64,7 @@ void H263plusVideoRTPSink
      }
      if (frameStart[0] != 0 || frameStart[1] != 0) {
        envir() << "H263plusVideoRTPSink::doSpecialFrameHandling(): unexpected non-zero first two bytes: "
diff --git a/debian/patches/021_ip_mreq_source.diff b/debian/patches/021_ip_mreq_source.diff
index 2498831..16afcee 100644
--- a/debian/patches/021_ip_mreq_source.diff
+++ b/debian/patches/021_ip_mreq_source.diff
@@ -1,6 +1,10 @@
---- a/groupsock/GroupsockHelper.cpp
-+++ b/groupsock/GroupsockHelper.cpp
-@@ -441,12 +441,14 @@
+---
+ groupsock/GroupsockHelper.cpp |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- liblivemedia.orig/groupsock/GroupsockHelper.cpp
++++ liblivemedia/groupsock/GroupsockHelper.cpp
+@@ -441,12 +441,14 @@ Boolean socketLeaveGroup(UsageEnvironmen
  // commands, and a special structure (ip_mreq_source).  If the include files
  // didn't define these, we do so here:
  #if !defined(IP_ADD_SOURCE_MEMBERSHIP)
diff --git a/debian/patches/022_synchronous_rtspclient.patch b/debian/patches/022_synchronous_rtspclient.patch
index 74141e9..3b215db 100644
--- a/debian/patches/022_synchronous_rtspclient.patch
+++ b/debian/patches/022_synchronous_rtspclient.patch
@@ -24,7 +24,7 @@ Forwarded: not-needed
 -#endif
 --- liblivemedia.orig/liveMedia/include/RTSPClient.hh
 +++ liblivemedia/liveMedia/include/RTSPClient.hh
-@@ -285,7 +285,6 @@ private:
+@@ -287,7 +287,6 @@ private:
    unsigned fSessionCookieCounter;
    Boolean fHTTPTunnelingConnectionIsPending;
  
@@ -32,7 +32,7 @@ Forwarded: not-needed
    // Old "RTSPClient" interface, which performs synchronous (blocking) operations.
    // This will eventually go away, so new applications should not use it.
  public:
-@@ -344,7 +343,6 @@ private: // used to implement the old in
+@@ -346,7 +345,6 @@ private: // used to implement the old in
    char fWatchVariableForSyncInterface;
    char* fResultString;
    int fResultCode;

-- 
liblivemedia packaging



More information about the pkg-multimedia-commits mailing list