[xiph-commits] r18875 - trunk/squishyball

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2013-03-12 13:02:24 -0700 (Tue, 12 Mar 2013)
New Revision: 18875

Modified:
   trunk/squishyball/loader.c
Log:
From: "Kyle J. McKay" <mackyle at gmail.com>
Subject: [PATCH 4/6] Support some equivalent AIFF formats

'twos' is the same as 'NONE'
don't check for nonzero blocksize



Modified: trunk/squishyball/loader.c
===================================================================
--- trunk/squishyball/loader.c	2013-03-12 20:00:36 UTC (rev 18874)
+++ trunk/squishyball/loader.c	2013-03-12 20:02:24 UTC (rev 18875)
@@ -500,7 +500,7 @@
       goto err;
     }
 
-    if(!memcmp(buffer+18, "NONE", 4)){
+    if(!memcmp(buffer+18, "NONE", 4) || !memcmp(buffer+18, "twos", 4)){
       bend = 1;
     }else if(!memcmp(buffer+18, "sowt", 4)){
       bend = 0;
@@ -528,8 +528,7 @@
   int offset = READ_U32_BE(buf2);
   int blocksize = READ_U32_BE(buf2+4);
 
-  if( blocksize != 0 ||
-      !(pcm->bits==24 || pcm->bits == 16 || pcm->bits == 8)){
+  if(!(pcm->bits==24 || pcm->bits == 16 || pcm->bits == 8)){
     fprintf(stderr,
             "%s: Unsupported type of AIFF/AIFC file\n"
             " Must be 8-, 16- or 24-bit integer PCM.\n",path);