Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/vorbis-tools/files: vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
Date: Sun, 31 Aug 2008 21:12:20
Message-Id: E1KZuDa-0000gG-33@stork.gentoo.org
1 loki_val 08/08/31 21:12:18
2
3 Added: vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
4 Log:
5 Fix bug 236236, upstream ticket 1316.
6 (Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)
7
8 Revision Changes Path
9 1.1 media-sound/vorbis-tools/files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/vorbis-tools/files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/vorbis-tools/files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch?rev=1.1&content-type=text/plain
13
14 Index: vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
15 ===================================================================
16 Index: oggenc/oggenc.c
17 ===================================================================
18 --- oggenc/oggenc.c (revision 14552)
19 +++ oggenc/oggenc.c (working copy)
20 @@ -147,6 +151,7 @@
21 char *artist=NULL, *album=NULL, *title=NULL, *track=NULL;
22 char *date=NULL, *genre=NULL;
23 input_format *format;
24 + int resampled = 0;
25
26 /* Set various encoding defaults */
27
28 @@ -324,6 +329,8 @@
29
30 if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate) {
31 int fromrate = enc_opts.rate;
32 +
33 + resampled = 1;
34 enc_opts.resamplefreq = opt.resamplefreq;
35 if(setup_resample(&enc_opts)) {
36 errors++;
37 @@ -369,7 +376,7 @@
38 clear_scaler(&enc_opts);
39 if(opt.downmix)
40 clear_downmix(&enc_opts);
41 - if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate)
42 + if(resampled)
43 clear_resample(&enc_opts);
44 clear_all: