[SCM] liblivemedia/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f45421b5a20c5a7d9bdcbdf11f1d652290847e42
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Sep 4 11:32:01 2011 +0200

    Refresh patches.

diff --git a/debian/patches/020_invalid_casts.diff b/debian/patches/020_invalid_casts.diff
index c7546cd..f16eec7 100644
--- a/debian/patches/020_invalid_casts.diff
+++ b/debian/patches/020_invalid_casts.diff
@@ -1,8 +1,11 @@
-Index: liblivemedia/liveMedia/MPEG1or2Demux.cpp
-===================================================================
---- liblivemedia.orig/liveMedia/MPEG1or2Demux.cpp	2010-04-20 23:23:06.000000000 +0100
-+++ liblivemedia/liveMedia/MPEG1or2Demux.cpp	2010-04-20 23:23:35.000000000 +0100
-@@ -161,7 +161,7 @@
+---
+ liveMedia/H263plusVideoRTPSink.cpp |    2 +-
+ liveMedia/MPEG1or2Demux.cpp        |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- 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 "
@@ -11,20 +14,18 @@ Index: liblivemedia/liveMedia/MPEG1or2Demux.cpp
      envir().internalError();
    }
  
-@@ -457,7 +457,7 @@
+@@ -457,7 +457,7 @@ void MPEGProgramStreamParser::parsePackH
      skipBytes(pack_stuffing_length);
    } else { // unknown
-     fUsingSource->envir() << "StreamParser::parsePack() saw strange byte "
+     fUsingDemux->envir() << "StreamParser::parsePack() saw strange byte "
 -			  << (void*)nextByte
 +			  << nextByte
  			  << " following pack_start_code\n";
    }
  
-Index: liblivemedia/liveMedia/H263plusVideoRTPSink.cpp
-===================================================================
---- liblivemedia.orig/liveMedia/H263plusVideoRTPSink.cpp	2010-04-20 23:23:06.000000000 +0100
-+++ liblivemedia/liveMedia/H263plusVideoRTPSink.cpp	2010-04-20 23:23:35.000000000 +0100
-@@ -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/022_safe_setlocale.diff b/debian/patches/022_safe_setlocale.diff
index 37a98db..37c8215 100644
--- a/debian/patches/022_safe_setlocale.diff
+++ b/debian/patches/022_safe_setlocale.diff
@@ -96,7 +96,7 @@ Licensed under GNU General Public License version 2 or higher.
      sprintf(buf, "Range: npt=%.3f-%.3f\r\n", start, end);
    }
  
-@@ -919,7 +919,7 @@ Boolean RTSPClient::parseTransportParams
+@@ -921,7 +921,7 @@ Boolean RTSPClient::parseTransportParams
  }
  
  Boolean RTSPClient::parseScaleParam(char const* paramStr, float& scale) {
@@ -107,7 +107,7 @@ Licensed under GNU General Public License version 2 or higher.
  
 --- liblivemedia.orig/liveMedia/RTSPCommon.cpp
 +++ liblivemedia/liveMedia/RTSPCommon.cpp
-@@ -137,7 +137,7 @@ Boolean parseRTSPRequestString(char cons
+@@ -150,7 +150,7 @@ Boolean parseRTSPRequestString(char cons
  Boolean parseRangeParam(char const* paramStr, double& rangeStart, double& rangeEnd) {
    double start, end;
    int numCharsMatched = 0;

-- 
liblivemedia packaging