summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTilman Klar <phoenix@gentoo.org>2002-12-01 10:24:59 +0000
committerTilman Klar <phoenix@gentoo.org>2002-12-01 10:24:59 +0000
commitaf86e142e7b2b3632e1b9d530c8e1e3397c45260 (patch)
tree0aab31746274da19cf3bcf2027019fcfd315ba06 /media-sound/lame/files
parentsmall fixes (diff)
downloadgentoo-2-af86e142e7b2b3632e1b9d530c8e1e3397c45260.tar.gz
gentoo-2-af86e142e7b2b3632e1b9d530c8e1e3397c45260.tar.bz2
gentoo-2-af86e142e7b2b3632e1b9d530c8e1e3397c45260.zip
Incorporated two patches. This closes bug #11194, thanks to Sebastian Droege <sebastian.droege@gmx.de> for the contribution.
Diffstat (limited to 'media-sound/lame/files')
-rw-r--r--media-sound/lame/files/digest-lame-3.93.0-r11
-rw-r--r--media-sound/lame/files/lame-3.93.0-gentoo.diff50
2 files changed, 51 insertions, 0 deletions
diff --git a/media-sound/lame/files/digest-lame-3.93.0-r1 b/media-sound/lame/files/digest-lame-3.93.0-r1
new file mode 100644
index 000000000000..1184ed7afd05
--- /dev/null
+++ b/media-sound/lame/files/digest-lame-3.93.0-r1
@@ -0,0 +1 @@
+MD5 2c054c7eec1f966499d0945642bd8cba lame-3.93.0.tar.gz 1036360
diff --git a/media-sound/lame/files/lame-3.93.0-gentoo.diff b/media-sound/lame/files/lame-3.93.0-gentoo.diff
new file mode 100644
index 000000000000..8e3e88b0036e
--- /dev/null
+++ b/media-sound/lame/files/lame-3.93.0-gentoo.diff
@@ -0,0 +1,50 @@
+--- libmp3lame/lame.c.orig 2002-12-01 11:01:49.000000000 +0100
++++ libmp3lame/lame.c 2002-12-01 10:45:42.000000000 +0100
+@@ -20,7 +20,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-/* $Id: lame-3.93.0-gentoo.diff,v 1.1 2002/12/01 10:24:59 phoenix Exp $ */
++/* $Id: lame-3.93.0-gentoo.diff,v 1.1 2002/12/01 10:24:59 phoenix Exp $ */
+
+ #ifdef HAVE_CONFIG_H
+ # include <config.h>
+@@ -474,7 +474,7 @@
+ gfc->quantization = 1;
+ gfc->noise_shaping = 1; /* 2=usually lowers quality */
+ gfc->substep_shaping = 2;
+- gfc->noise_shaping_amp = 3;
++ gfc->noise_shaping_amp = 2;
+ gfc->noise_shaping_stop = 1;
+ gfc->use_best_huffman = 1; /* 2 not yet coded */
+ }
+--- libmp3lame/psymodel.c.orig 2002-12-01 11:02:47.000000000 +0100
++++ libmp3lame/psymodel.c 2002-12-01 10:45:42.000000000 +0100
+@@ -19,7 +19,7 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
+-/* $Id: lame-3.93.0-gentoo.diff,v 1.1 2002/12/01 10:24:59 phoenix Exp $ */
++/* $Id: lame-3.93.0-gentoo.diff,v 1.1 2002/12/01 10:24:59 phoenix Exp $ */
+
+
+ /*
+@@ -1789,6 +1789,9 @@
+ }
+
+ /* 2001-07-13 */
++ thr[b] = Max(1e-6, ecb);
++
++ if (gfp->VBR == vbr_mtrh) {
+ thr[b] = Min( ecb, rpelev_s * gfc->nb_s1[chn][b] );
+ if (gfc->blocktype_old[chn>1 ? chn-2 : chn] == SHORT_TYPE ) {
+ thr[b] = Min( thr[b], rpelev2_s * gfc->nb_s2[chn][b] );
+@@ -1796,6 +1799,7 @@
+ thr[b] = Max( thr[b], 1e-37 );
+ gfc->nb_s2[chn][b] = gfc->nb_s1[chn][b];
+ gfc->nb_s1[chn][b] = ecb;
++ }
+ }
+ }
+ for ( sb = 0; sb < NBPSY_s; sb++ )
+