public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Peter Alfredsen (loki_val)" <loki_val@gentoo.org>
To: gentoo-commits@lists.gentoo.org
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:18 +0000	[thread overview]
Message-ID: <E1KZuDa-0000gG-33@stork.gentoo.org> (raw)

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:
 






                 reply	other threads:[~2008-08-31 21:12 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1KZuDa-0000gG-33@stork.gentoo.org \
    --to=loki_val@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox