[vlc-commits] contrib: live555: update patch

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Nov 14 12:37:19 2011 -0500| [153e6c47cc92db78e93943d8b26b784029aa87d5] | committer: Rafaël Carré

contrib: live555: update patch

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=153e6c47cc92db78e93943d8b26b784029aa87d5
---

 contrib/src/live555/live-inet_ntop.patch |   48 +++++++++++++++---------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/contrib/src/live555/live-inet_ntop.patch b/contrib/src/live555/live-inet_ntop.patch
index 60071e6..503d877 100644
--- a/contrib/src/live555/live-inet_ntop.patch
+++ b/contrib/src/live555/live-inet_ntop.patch
@@ -158,7 +158,7 @@ diff -ru live.orig/liveMedia/RTSPClient.cpp live/liveMedia/RTSPClient.cpp
 diff -ru live.orig/liveMedia/RTSPServer.cpp live/liveMedia/RTSPServer.cpp
 --- live.orig/liveMedia/RTSPServer.cpp	2010-10-20 10:31:13.000000000 +0200
 +++ live/liveMedia/RTSPServer.cpp	2010-10-20 12:34:04.772177998 +0200
-@@ -111,11 +111,12 @@
+@@ -114,11 +114,12 @@
    char urlBuffer[100]; // more than big enough for "rtsp://<ip-address>:<port>/"
  
    portNumBits portNumHostOrder = ntohs(fRTSPServerPort.num());
@@ -169,11 +169,11 @@ diff -ru live.orig/liveMedia/RTSPServer.cpp live/liveMedia/RTSPServer.cpp
    } else {
      sprintf(urlBuffer, "rtsp://%s:%hu/",
 -	    our_inet_ntoa(ourAddress.sin_addr), portNumHostOrder);
-+	    our_inet_ntoa(ourAddress.sin_addr, buf), portNumHostOrder);
++        our_inet_ntoa(ourAddress.sin_addr, buf), portNumHostOrder);
    }
  
    return strDup(urlBuffer);
-@@ -264,7 +265,8 @@
+@@ -266,7 +267,8 @@
    increaseSendBufferTo(envir(), clientSocket, 50*1024);
  
  #ifdef DEBUG
@@ -183,29 +183,29 @@ diff -ru live.orig/liveMedia/RTSPServer.cpp live/liveMedia/RTSPServer.cpp
  #endif
  
    // Create a new object for this RTSP session.
-@@ -860,8 +862,10 @@
-   ReceivingInterfaceAddr = origReceivingInterfaceAddr;
- 
-   struct in_addr destinationAddr; destinationAddr.s_addr = destinationAddress;
--  char* destAddrStr = strDup(our_inet_ntoa(destinationAddr));
--  char* sourceAddrStr = strDup(our_inet_ntoa(sourceAddr.sin_addr));
-+  char destAddrStr[16];
-+  our_inet_ntoa(destinationAddr, destAddrStr);
-+  char sourceAddrStr[16];
-+  our_inet_ntoa(sourceAddr.sin_addr, sourceAddrStr);
-   if (fIsMulticast) {
-     switch (streamingMode) {
-     case RTP_UDP:
-@@ -936,7 +940,7 @@
-     }
+@@ -885,8 +887,10 @@
+     ReceivingInterfaceAddr = origReceivingInterfaceAddr;
+     
+     struct in_addr destinationAddr; destinationAddr.s_addr = destinationAddress;
+-    char* destAddrStr = strDup(our_inet_ntoa(destinationAddr));
+-    char* sourceAddrStr = strDup(our_inet_ntoa(sourceAddr.sin_addr));
++    char destAddrStr[16];
++    our_inet_ntoa(destinationAddr, destAddrStr);
++    char sourceAddrStr[16];
++    our_inet_ntoa(sourceAddr.sin_addr, sourceAddrStr);
+     if (fIsMulticast) {
+       switch (streamingMode) {
+         case RTP_UDP:
+@@ -961,7 +965,7 @@
+    }
+       }
      }
-   }
--  delete[] destAddrStr; delete[] sourceAddrStr; delete[] streamingModeString;
-+  delete[] streamingModeString;
- }
+-    delete[] destAddrStr; delete[] sourceAddrStr; delete[] streamingModeString;
++    delete[] streamingModeString;
+   } while (0);
  
- void RTSPServer::RTSPClientSession
-@@ -1446,7 +1450,8 @@
+   delete[] concatenatedStreamName;
+@@ -1544,7 +1548,8 @@
    // If this gets called, the client session is assumed to have timed out,
    // so delete it:
  #ifdef DEBUG