[xiph-cvs] cvs commit: vorbis-tools/oggenc audio.c

[Jack Moffitt]

jack        01/12/07 18:19:15

  Modified:    oggenc   Tag: volsung_kc_20011011 audio.c
  Log:
  While making a .wav in my studio, I noticed we're still printing warning for
  18 byte chunks.  These must be accepted as perfectly valid, considering that
  major tools (including Microsoft's own) produce files of this type.  It's
  confusing to warn users when the files are valid, so don't do it.  We still
  catch and warn for format chunk sizes that are not 16 or 18 bytes.

Revision  Changes    Path
No                   revision

No                   revision

1.12.4.1  +6 -6      vorbis-tools/oggenc/audio.c

Index: audio.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/audio.c,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -r1.12 -r1.12.4.1
--- audio.c	2001/05/27 10:30:45	1.12
+++ audio.c	2001/12/08 02:19:14	1.12.4.1
@@ -356,13 +356,13 @@
                 return 0; /* Weird format chunk */
         }
 
-	/* A common error is to have an 18-byte format chunk with the last two
-	 * bytes 0. This is incorrect, but sufficiently common that we only warn
-	 * about it instead of refusing it. 
-	 * Please, if you have a program that's creating these 18 byte chunks, send
-	 * a bug report to whoever makes it 
+	/* A common error is to have a format chunk that is not 16 or 18 bytes
+	 * in size.  This is incorrect, but not fatal, so we only warn about 
+	 * it instead of refusing to work with the file.  Please, if you
+	 * have a program that's creating format chunks of sizes other than
+	 * 16 or 18 bytes in size, report a bug to the author.
          */
-	if(len!=16)
+	if(len!=16 && len!=18)
                 fprintf(stderr, 
                                 "Warning: INVALID format chunk in wav header.\n"
                                 " Trying to read anyway (may not work)...\n");

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.