public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-sound/vorbis-tools/files: vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
@ 2008-08-31 21:12 Peter Alfredsen (loki_val)
  0 siblings, 0 replies; only message in thread
From: Peter Alfredsen (loki_val) @ 2008-08-31 21:12 UTC (permalink / raw
  To: gentoo-commits

loki_val    08/08/31 21:12:18

  Added:                vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
  Log:
  Fix bug 236236, upstream ticket 1316.
  (Portage version: 2.2_rc8/cvs/Linux 2.6.25.8 i686)

Revision  Changes    Path
1.1                  media-sound/vorbis-tools/files/vorbis-tools-1.2.0-oggenc-resample-call-fix.patch

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
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

Index: vorbis-tools-1.2.0-oggenc-resample-call-fix.patch
===================================================================
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:
 






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-08-31 21:12 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-31 21:12 [gentoo-commits] gentoo-x86 commit in media-sound/vorbis-tools/files: vorbis-tools-1.2.0-oggenc-resample-call-fix.patch Peter Alfredsen (loki_val)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox