Ticket #1128: extract2.diff

extract.c

@@ -221 +221 @@
 
                 if (sample_rate == 0xa5 || sample_rate == 0xa6)
                         real_samplerate = 11025;
-                if (sample_rate == 0xd2 || sample_rate == 0xd3)
-                        real_samplerate = 22050;
                 else
-                        real_samplerate = 1000000 / (256 - sample_rate);
+                        if (sample_rate == 0xd2 || sample_rate == 0xd3)
+                                real_samplerate = 22050;
+                        else
+                                real_samplerate = 1000000 / (256 - sample_rate);
 
                 printf(" - sample rate = %d (%02x)\n", 1000000 / (256 - sample_rate), sample_rate);
                 printf(" - compression = %s (%02x)\n",
@@ -272 +273 @@
                         if (oggparms.silent) {
                                 strcat(fbuf, "--quiet ");
                         }
-                        sprintf(fbuf_temp, "-q %i -r -C 1 --raw-endianness=1 -R %i --resample 22050 %s -o %s",
+                        if (real_samplerate!=22050) {
+                                strcat(fbuf, "--resample 22050 ");
+                        }
+                        sprintf(fbuf_temp, "-q %i -r -C 1 --raw-endianness=1 -R %i %s -o %s",
                                 oggparms.quality, real_samplerate,
                                 rawname, mp3name);
                         strcat(fbuf, fbuf_temp);