[xiph-commits] r3530 - in libannodex/trunk/src: importers libannodex tools

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-03-27 04:35:59 -0700 (Thu, 27 Mar 2008)
New Revision: 3530

Modified:
   libannodex/trunk/src/importers/anx_import_ogg.c
   libannodex/trunk/src/libannodex/content_type.c
   libannodex/trunk/src/tools/anxed.c
Log:
remove x- prefix from xiph/annodex mime types throughout


Modified: libannodex/trunk/src/importers/anx_import_ogg.c
===================================================================
--- libannodex/trunk/src/importers/anx_import_ogg.c	2008-03-27 11:20:15 UTC (rev 3529)
+++ libannodex/trunk/src/importers/anx_import_ogg.c	2008-03-27 11:35:59 UTC (rev 3530)
@@ -62,13 +62,13 @@
 /* RFC3534 */
 #define OGG_CONTENT_TYPE "application/ogg"
 
-#define ANX_CONTENT_TYPE "application/x-annodex"
+#define ANX_CONTENT_TYPE "application/annodex"
 
-#define CMML_CONTENT_TYPE "text/x-cmml"
-#define VORBIS_CONTENT_TYPE "audio/x-vorbis"
-#define SPEEX_CONTENT_TYPE "audio/x-speex"
-#define THEORA_CONTENT_TYPE "video/x-theora"
-#define XVID_CONTENT_TYPE "video/x-xvid"
+#define CMML_CONTENT_TYPE "text/cmml"
+#define VORBIS_CONTENT_TYPE "audio/vorbis"
+#define SPEEX_CONTENT_TYPE "audio/speex"
+#define THEORA_CONTENT_TYPE "video/theora"
+#define XVID_CONTENT_TYPE "video/xvid"
 
 /** well-defined sizeof(AnxData) binary portion for Annodex v2 */
 #define ANX_DATA_SIZE 28

Modified: libannodex/trunk/src/libannodex/content_type.c
===================================================================
--- libannodex/trunk/src/libannodex/content_type.c	2008-03-27 11:20:15 UTC (rev 3529)
+++ libannodex/trunk/src/libannodex/content_type.c	2008-03-27 11:35:59 UTC (rev 3530)
@@ -172,9 +172,9 @@
 
   ext++;
 
-  if (!strncasecmp (ext, "cmml", 5)) return strdup ("text/x-cmml");
-  if (!strncasecmp (ext, "anx", 4)) return strdup ("application/x-annodex");
-  if (!strncasecmp (ext, "spx", 4)) return strdup ("audio/x-speex");
+  if (!strncasecmp (ext, "cmml", 5)) return strdup ("text/cmml");
+  if (!strncasecmp (ext, "anx", 4)) return strdup ("application/annodex");
+  if (!strncasecmp (ext, "spx", 4)) return strdup ("audio/speex");
 
   /* RFC3534 */
   if (!strncasecmp (ext, "ogg", 4)) return strdup ("application/ogg");

Modified: libannodex/trunk/src/tools/anxed.c
===================================================================
--- libannodex/trunk/src/tools/anxed.c	2008-03-27 11:20:15 UTC (rev 3529)
+++ libannodex/trunk/src/tools/anxed.c	2008-03-27 11:35:59 UTC (rev 3530)
@@ -43,8 +43,6 @@
 
 /*#define DEBUG*/
 
-#define ANX_CONTENT_TYPE "application/x-annodex"
-
 #define MEDIA_BUF_LEN 8192
 
 /*