mimetype fixes patch by (Ryutaroh Matsumoto <ryutaroh at it dot ss dot titech dot ac dot jp>)

Originally committed as revision 1352 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffserver.c

@@ -1489,7 +1489,6 @@ static int http_parse_request(HTTPContext *c)
         c->wmp_client_id = random() & 0x7fffffff;
 
         q += sprintf(q, "Server: Cougar 4.1.0.3923\r\nCache-Control: no-cache\r\nPragma: client-id=%d\r\nPragma: features=\"broadcast\"\r\n", c->wmp_client_id);
-        mime_type = "application/octet-stream"; 
     }
     q += sprintf(q, "Content-Type: %s\r\n", mime_type);
     q += sprintf(q, "\r\n");

libavformat/asf.c

@@ -1217,7 +1217,7 @@ static AVInputFormat asf_iformat = {
 static AVOutputFormat asf_oformat = {
     "asf",
     "asf format",
-    "application/octet-stream",
+    "video/x-ms-asf",
     "asf,wmv",
     sizeof(ASFContext),
 #ifdef CONFIG_MP3LAME
@@ -1234,7 +1234,7 @@ static AVOutputFormat asf_oformat = {
 static AVOutputFormat asf_stream_oformat = {
     "asf_stream",
     "asf format",
-    "application/octet-stream",
+    "video/x-ms-asf",
     "asf,wmv",
     sizeof(ASFContext),
 #ifdef CONFIG_MP3LAME

libavformat/mpeg.c

@@ -628,7 +628,7 @@ static int mpegps_read_close(AVFormatContext *s)
 static AVOutputFormat mpeg1system_mux = {
     "mpeg",
     "MPEG1 System format",
-    "video/x-mpeg",
+    "video/mpeg",
     "mpg,mpeg",
     sizeof(MpegMuxContext),
     CODEC_ID_MP2,
@@ -641,7 +641,7 @@ static AVOutputFormat mpeg1system_mux = {
 static AVOutputFormat mpeg1vcd_mux = {
     "vcd",
     "MPEG1 System format (VCD)",
-    "video/x-mpeg",
+    "video/mpeg",
     NULL,
     sizeof(MpegMuxContext),
     CODEC_ID_MP2,
@@ -654,7 +654,7 @@ static AVOutputFormat mpeg1vcd_mux = {
 static AVOutputFormat mpeg2vob_mux = {
     "vob",
     "MPEG2 PS format (VOB)",
-    "video/x-mpeg",
+    "video/mpeg",
     "vob",
     sizeof(MpegMuxContext),
     CODEC_ID_MP2,

libavformat/rm.c

@@ -756,7 +756,7 @@ static AVInputFormat rm_iformat = {
 static AVOutputFormat rm_oformat = {
     "rm",
     "rm format",
-    "audio/x-pn-realaudio",
+    "application/vnd.rn-realmedia",
     "rm,ra",
     sizeof(RMContext),
     CODEC_ID_AC3,