Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 68ae6bf0d09c3f3076554af54ffffac6 > files > 5

vorbis-tools-1.2.0-4mdv2009.0.src.rpm

Index: /trunk/vorbis-tools/oggenc/oggenc.c
===================================================================
--- /trunk/vorbis-tools/oggenc/oggenc.c (revision 14565)
+++ /trunk/vorbis-tools/oggenc/oggenc.c (revision 14631)
@@ -148,4 +148,5 @@
         char *date=NULL, *genre=NULL;
         input_format *format;
+        int resampled = 0;
 
         /* Set various encoding defaults */
@@ -326,4 +327,6 @@
         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)) {
@@ -371,5 +374,5 @@
         if(opt.downmix)
             clear_downmix(&enc_opts);
-        if(opt.resamplefreq && opt.resamplefreq != enc_opts.rate)
+        if(resampled)
             clear_resample(&enc_opts);
 clear_all:
@@ -949,5 +952,5 @@
             i = filenum;
 
-        *album = opt->album[i];    
+        *album = opt->album[i];
         add_tag(vc, opt, "album", opt->album[i]);
     }