[SCM] liblivemedia/master: Refresh patches.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Mon Jan 13 23:03:17 UTC 2014


The following commit has been merged in the master branch:
commit 8787f2922e79a370f50da99ded2fffdbc05e5c53
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Jan 13 22:33:27 2014 +0100

    Refresh patches.

diff --git a/debian/patches/020_invalid_casts.patch b/debian/patches/020_invalid_casts.patch
index 4c93d0e..ef587c8 100644
--- a/debian/patches/020_invalid_casts.patch
+++ b/debian/patches/020_invalid_casts.patch
@@ -1,8 +1,8 @@
 Description: Fix invalid cast from (short) integers to void pointers.
 
---- liblivemedia.orig/liveMedia/MPEG1or2Demux.cpp
-+++ liblivemedia/liveMedia/MPEG1or2Demux.cpp
-@@ -161,7 +161,7 @@ void MPEG1or2Demux::registerReadInterest
+--- a/liveMedia/MPEG1or2Demux.cpp
++++ b/liveMedia/MPEG1or2Demux.cpp
+@@ -161,7 +161,7 @@
    // Make sure this stream is not already being read:
    if (out.isCurrentlyAwaitingData) {
      envir() << "MPEG1or2Demux::registerReadInterest(): attempt to read stream id "
@@ -11,7 +11,7 @@ Description: Fix invalid cast from (short) integers to void pointers.
      envir().internalError();
    }
  
-@@ -460,7 +460,7 @@ void MPEGProgramStreamParser::parsePackH
+@@ -460,7 +460,7 @@
      skipBytes(pack_stuffing_length);
    } else { // unknown
      fUsingDemux->envir() << "StreamParser::parsePack() saw strange byte "
@@ -20,9 +20,9 @@ Description: Fix invalid cast from (short) integers to void pointers.
  			  << " following pack_start_code\n";
    }
  
---- liblivemedia.orig/liveMedia/H263plusVideoRTPSink.cpp
-+++ liblivemedia/liveMedia/H263plusVideoRTPSink.cpp
-@@ -64,7 +64,7 @@ void H263plusVideoRTPSink
+--- a/liveMedia/H263plusVideoRTPSink.cpp
++++ b/liveMedia/H263plusVideoRTPSink.cpp
+@@ -64,7 +64,7 @@
      }
      if (frameStart[0] != 0 || frameStart[1] != 0) {
        envir() << "H263plusVideoRTPSink::doSpecialFrameHandling(): unexpected non-zero first two bytes: "

-- 
liblivemedia packaging



More information about the pkg-multimedia-commits mailing list