media-sound/vorbis-tools/files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

Index: oggenc/oggenc.c
===================================================================
--- oggenc/oggenc.c	(revision 14552)
+++ oggenc/oggenc.c	(working copy)
@@ -147,6 +151,7 @@
         char *artist=NULL, *album=NULL, *title=NULL, *track=NULL;
         char *date=NULL, *genre=NULL;
         input_format *format;
+        int resampled = 0;
 
         /* Set various encoding defaults */
 
@@ -324,6 +329,8 @@
 
         if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate) {
             int fromrate = enc_opts.rate;
+
+            resampled = 1;
             enc_opts.resamplefreq = opt.resamplefreq;
             if(setup_resample(&enc_opts)) {
                 errors++;
@@ -369,7 +376,7 @@
             clear_scaler(&enc_opts);
         if(opt.downmix)
             clear_downmix(&enc_opts);
-        if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate)
+        if(resampled)
             clear_resample(&enc_opts);
 clear_all: