# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1100247971 0
# Node ID 3f03af31e24678b032abe53ed9b9a84ed2843aa4
# Parent  365c3adc99c169b38ceaae6bc2985b335fcc3f80
Backported .voc fix.

diff -r 365c3adc99c1 -r 3f03af31e246 CHANGELOG
--- 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
diff -r 365c3adc99c1 -r 3f03af31e246 decoders/voc.c
--- 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)))