[xiph-commits] r15042 - in trunk/ogg-tools: oggmerge oggsplit

[conrad at svn.xiph.org]

Author: conrad
Date: 2008-06-16 03:19:24 -0700 (Mon, 16 Jun 2008)
New Revision: 15042

Modified:
   trunk/ogg-tools/oggmerge/kate.c
   trunk/ogg-tools/oggmerge/oggmerge.c
   trunk/ogg-tools/oggsplit/stream.c
Log:
fit kate magic into the first 8 bytes. Patch by ogg.k.ogg.k


Modified: trunk/ogg-tools/oggmerge/kate.c
===================================================================
--- trunk/ogg-tools/oggmerge/kate.c	2008-06-16 10:17:08 UTC (rev 15041)
+++ trunk/ogg-tools/oggmerge/kate.c	2008-06-16 10:19:24 UTC (rev 15042)
@@ -129,7 +129,7 @@
 				ogg_stream_clear(&os);
                                 return EBADHEADER;
                         }
-                        if (memcmp(op.packet,"\200kate\0\0\0\0",9)) {
+                        if (memcmp(op.packet,"\200kate\0\0\0",8)) {
 				ogg_stream_clear(&os);
                                 return EBADHEADER;
                         }

Modified: trunk/ogg-tools/oggmerge/oggmerge.c
===================================================================
--- trunk/ogg-tools/oggmerge/oggmerge.c	2008-06-16 10:17:08 UTC (rev 15041)
+++ trunk/ogg-tools/oggmerge/oggmerge.c	2008-06-16 10:19:24 UTC (rev 15042)
@@ -144,7 +144,7 @@
                 fread(buf,1,sizeof(buf),f);
                 fclose(f);
                 if (!memcmp(buf+offset,"\001vorbis",7)) return TYPEVORBIS;
-                if (!memcmp(buf+offset,"\200kate\0\0\0\0",9)) return TYPEKATE;
+                if (!memcmp(buf+offset,"\200kate\0\0\0",8)) return TYPEKATE;
                 if (!memcmp(buf+offset,"\200theora",7)) return TYPETHEORA;
                 if (!memcmp(buf+offset,"Speex   ",8)) return TYPESPEEX;
                 return TYPEUNKNOWN;

Modified: trunk/ogg-tools/oggsplit/stream.c
===================================================================
--- trunk/ogg-tools/oggsplit/stream.c	2008-06-16 10:17:08 UTC (rev 15041)
+++ trunk/ogg-tools/oggsplit/stream.c	2008-06-16 10:19:24 UTC (rev 15042)
@@ -18,7 +18,7 @@
 const char *magic_theora = "\x80theora";
 const char *magic_speex  = "Speex";
 const char *magic_flac   = "fLaC";
-const char *magic_kate   = "\x80kate\0\0\0\0";
+const char *magic_kate   = "\x80kate\0\0\0";
 
 int stream_ctrl_init(stream_ctrl_t *sc)
 {