[SCM] mpg123/master: Merge tag 'upstream/1.13.7'

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Mar 27 09:49:49 UTC 2012


New upstream release. (Closes: #644851)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a466ec7c70e0def40bc65cd7eb78d376fe381c48
X-Git-Newrev: 2fd55aaa7460f291d1635e4cf83071c246f536ca

The following commit has been merged in the master branch:
commit 2fd55aaa7460f291d1635e4cf83071c246f536ca
Merge: a466ec7c70e0def40bc65cd7eb78d376fe381c48 e826e8f04f31cf53ec6f10513e3ca07870c3f2a6
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 27 11:48:51 2012 +0200

    Merge tag 'upstream/1.13.7'
    
    Upstream version 1.13.7
    
    Conflicts:
    	configure.ac
    	src/libmpg123/frame.c

diff --combined src/libmpg123/dither.c
index 1a1ca3c,30dbdd1..35d0a47
--- a/src/libmpg123/dither.c
+++ b/src/libmpg123/dither.c
@@@ -10,7 -10,7 +10,7 @@@
  #include "compat.h"
  #include "dither.h"
  
- const uint32_t init_seed = 2463534242UL;
+ static const uint32_t init_seed = 2463534242UL;
  
  #define LAP 100
  
@@@ -100,7 -100,6 +100,7 @@@ static void highpass_tpdf_noise(float *
  	}
  }
  
 +#if 0
  void mpg123_noise(float* table, size_t count, enum mpg123_noise_type noisetype)
  {
  	switch(noisetype)
@@@ -112,7 -111,6 +112,7 @@@
  		break;
  	}
  }
 +#endif
  
  /* Generate white noise and shape it with a high pass filter. */
  void dither_table_init(float *dithertable)

-- 
mpg123 packaging



More information about the pkg-multimedia-commits mailing list