[SCM] liblivemedia/master: Refresh patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun May 6 13:14:54 UTC 2012


The following commit has been merged in the master branch:
commit ed34151146adf55a78757bc24546964d37712345
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun May 6 06:10:12 2012 -0700

    Refresh patches.

diff --git a/debian/patches/022_synchronous_rtspclient.patch b/debian/patches/022_synchronous_rtspclient.patch
index 3b215db..beeaf72 100644
--- a/debian/patches/022_synchronous_rtspclient.patch
+++ b/debian/patches/022_synchronous_rtspclient.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- liblivemedia.orig/liveMedia/RTSPClient.cpp
 +++ liblivemedia/liveMedia/RTSPClient.cpp
-@@ -1677,7 +1677,6 @@ RTSPClient::RequestRecord* RTSPClient::R
+@@ -1691,7 +1691,6 @@ RTSPClient::RequestRecord* RTSPClient::R
  }
  
  
@@ -16,7 +16,7 @@ Forwarded: not-needed
  // Implementation of the old (synchronous) "RTSPClient" interface, using the new (asynchronous) interface:
  RTSPClient* RTSPClient::createNew(UsageEnvironment& env,
  				  int verbosityLevel,
-@@ -1997,5 +1996,3 @@ void RTSPClient::timeoutHandlerForSyncIn
+@@ -2011,5 +2010,3 @@ void RTSPClient::timeoutHandlerForSyncIn
    // Signal a break from the event loop (thereby returning from the blocking command):
    fWatchVariableForSyncInterface = ~0;
  }
@@ -24,7 +24,7 @@ Forwarded: not-needed
 -#endif
 --- liblivemedia.orig/liveMedia/include/RTSPClient.hh
 +++ liblivemedia/liveMedia/include/RTSPClient.hh
-@@ -287,7 +287,6 @@ private:
+@@ -288,7 +288,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:
-@@ -346,7 +345,6 @@ private: // used to implement the old in
+@@ -347,7 +346,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