Mercurial > SDL_sound_CoreAudio

changeset 481:3f03af31e246 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backported .voc fix.
author Ryan C. Gordon <icculus@icculus.org>
date Fri, 12 Nov 2004 08:26:11 +0000
parents 365c3adc99c1
children b8f694c12010
files CHANGELOG decoders/voc.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGELOG	Sat May 08 22:10:44 2004 +0000
+++ b/CHANGELOG	Fri Nov 12 08:26:11 2004 +0000
@@ -2,6 +2,7 @@
  * CHANGELOG.
  */
 
+11122004 - Backport from devtree: fix .voc decoder crash on file open.
 05082004 - Fixed "bootstrap" to work with MacOSX.
 05072004 - Backed out some commits, converted repository to Subversion, and
            branched off to a 1.1.0 development tree. Changed MikMod URL...old
--- a/decoders/voc.c	Sat May 08 22:10:44 2004 +0000
+++ b/decoders/voc.c	Fri Nov 12 08:26:11 2004 +0000
@@ -229,8 +229,9 @@
                         BAIL_MACRO("VOC sample rate codes differ", 0);
 
                     v->rate = uc;
+                    v->channels = 1;
                     sample->actual.rate = 1000000.0/(256 - v->rate);
-                    v->channels = 1;
+                    sample->actual.channels = 1;
                 } /* if */
 
                 if (!voc_readbytes(src, v, &uc, sizeof (uc)))