[SCM] idjc/master: Refresh idjc-twolame.patch patch.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Apr 11 11:54:46 UTC 2011


The following commit has been merged in the master branch:
commit c1716e07422dc19a33a38f4e67dfda7f52463641
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 11 13:54:33 2011 +0200

    Refresh idjc-twolame.patch patch.

diff --git a/debian/patches/idjc-twolame.patch b/debian/patches/idjc-twolame.patch
index 9542844..b4ffb3a 100644
--- a/debian/patches/idjc-twolame.patch
+++ b/debian/patches/idjc-twolame.patch
@@ -12,7 +12,7 @@ Forwarded: no
 
 --- idjc.orig/c/live_mp3_encoder.c
 +++ idjc/c/live_mp3_encoder.c
-@@ -123,24 +123,26 @@ static void live_mp3_encoder_main(struct
+@@ -87,24 +87,26 @@ static void live_mp3_encoder_main(struct
           fprintf(stderr, "live_mp3_encoder_main: malloc failure\n");
           goto bailout;
           }
@@ -50,7 +50,7 @@ Forwarded: no
           free(s->mp3buf);
           goto bailout;
           }
-@@ -161,7 +163,8 @@ static void live_mp3_encoder_main(struct
+@@ -125,7 +127,8 @@ static void live_mp3_encoder_main(struct
        if (encoder->flush || !encoder->run_request_f)
           {
           encoder->flush = FALSE;
@@ -60,7 +60,7 @@ Forwarded: no
           fprintf(stderr, "live_mp3_encoder_main: flushing %d bytes\n", mp3bytes);
           live_mp3_write_packet(encoder, s, s->mp3buf, mp3bytes, PF_MP3 | PF_FINAL);
           encoder->encoder_state = ES_STOPPING;
-@@ -179,7 +182,7 @@ static void live_mp3_encoder_main(struct
+@@ -143,7 +146,7 @@ static void live_mp3_encoder_main(struct
                    *l++ *= 32768.0F;
                    *r++ *= 32768.0F;
                    }
@@ -69,7 +69,7 @@ Forwarded: no
              encoder_ip_data_free(id);
              s->lame_samples += id->qty_samples;
              live_mp3_write_packet(encoder, s, s->mp3buf, mp3bytes, PF_MP3 | s->packetflags);
-@@ -197,7 +200,7 @@ static void live_mp3_encoder_main(struct
+@@ -161,7 +164,7 @@ static void live_mp3_encoder_main(struct
        }
     if (encoder->encoder_state == ES_STOPPING)
        {
@@ -98,7 +98,7 @@ Forwarded: no
     int lame_quality;
 --- idjc.orig/configure
 +++ idjc/configure
-@@ -5526,13 +5526,13 @@ fi
+@@ -5614,13 +5614,13 @@ fi
  
  
  if test $makelame != "no" ; then
@@ -116,7 +116,7 @@ Forwarded: no
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -5542,28 +5542,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+@@ -5630,28 +5630,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  #ifdef __cplusplus
  extern "C"
  #endif
@@ -155,7 +155,7 @@ Forwarded: no
  
 --- idjc.orig/configure.ac
 +++ idjc/configure.ac
-@@ -146,12 +146,12 @@ AC_ARG_ENABLE(lame,
+@@ -148,12 +148,12 @@ AC_ARG_ENABLE(lame,
     AC_HELP_STRING([--disable-lame],[remove capability to stream/record mp3 format]),[makelame=$enableval],[makelame="maybe"])
  
  if test $makelame != "no" ; then

-- 
idjc packaging



More information about the pkg-multimedia-commits mailing list