# HG changeset patch # User michaelni # Date 1040425858 0 # Node ID b167760cd0aa29e3751fd445ac76aedfe78f4351 # Parent 8a5285a0ca2f3b133718abe8f61f4897250f3068 mimetype fixes patch by (Ryutaroh Matsumoto ) diff -r 8a5285a0ca2f -r b167760cd0aa asf.c --- a/asf.c Fri Dec 20 21:05:59 2002 +0000 +++ b/asf.c Fri Dec 20 23:10:58 2002 +0000 @@ -1217,7 +1217,7 @@ 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_stream_oformat = { "asf_stream", "asf format", - "application/octet-stream", + "video/x-ms-asf", "asf,wmv", sizeof(ASFContext), #ifdef CONFIG_MP3LAME diff -r 8a5285a0ca2f -r b167760cd0aa mpeg.c --- a/mpeg.c Fri Dec 20 21:05:59 2002 +0000 +++ b/mpeg.c Fri Dec 20 23:10:58 2002 +0000 @@ -628,7 +628,7 @@ 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 mpeg1vcd_mux = { "vcd", "MPEG1 System format (VCD)", - "video/x-mpeg", + "video/mpeg", NULL, sizeof(MpegMuxContext), CODEC_ID_MP2, @@ -654,7 +654,7 @@ static AVOutputFormat mpeg2vob_mux = { "vob", "MPEG2 PS format (VOB)", - "video/x-mpeg", + "video/mpeg", "vob", sizeof(MpegMuxContext), CODEC_ID_MP2, diff -r 8a5285a0ca2f -r b167760cd0aa rm.c --- a/rm.c Fri Dec 20 21:05:59 2002 +0000 +++ b/rm.c Fri Dec 20 23:10:58 2002 +0000 @@ -756,7 +756,7 @@ static AVOutputFormat rm_oformat = { "rm", "rm format", - "audio/x-pn-realaudio", + "application/vnd.rn-realmedia", "rm,ra", sizeof(RMContext), CODEC_ID_AC3,