From 9f85a1e7c30f0eb1bacc0dd0ef85de487e72d245 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 11 Feb 2003 12:18:22 +0000 Subject: [PATCH] Now that it's been completely officially assigned, use application/ogg instead of application/x-ogg svn path=/trunk/icecast/; revision=4336 --- src/format.c | 6 ++++-- src/fserve.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/format.c b/src/format.c index 1ce5238e..b18ed172 100644 --- a/src/format.c +++ b/src/format.c @@ -29,7 +29,9 @@ format_type_t format_get_type(char *contenttype) { if(strcmp(contenttype, "application/x-ogg") == 0) - return FORMAT_TYPE_VORBIS; + return FORMAT_TYPE_VORBIS; /* Backwards compatibility */ + else if(strcmp(contenttype, "application/ogg") == 0) + return FORMAT_TYPE_VORBIS; /* Now blessed by IANA */ else if(strcmp(contenttype, "audio/mpeg") == 0) return FORMAT_TYPE_MP3; else @@ -40,7 +42,7 @@ char *format_get_mimetype(format_type_t type) { switch(type) { case FORMAT_TYPE_VORBIS: - return "application/x-ogg"; + return "application/ogg"; break; case FORMAT_TYPE_MP3: return "audio/mpeg"; diff --git a/src/fserve.c b/src/fserve.c index 35b5d84c..61e85d76 100644 --- a/src/fserve.c +++ b/src/fserve.c @@ -315,7 +315,7 @@ static char *fserve_content_type(char *path) else { /* Fallbacks for a few basic ones */ if(!strcmp(ext, "ogg")) - return "application/x-ogg"; + return "application/ogg"; else if(!strcmp(ext, "mp3")) return "audio/mpeg"; else if(!strcmp(ext, "html"))