From c6c11cb6c620af1e4d4d96b373456b83cfec1ae5 Mon Sep 17 00:00:00 2001
From: Ryutaroh Matsumoto <ryutaroh@it.ss.titech.ac.jp>
Date: Fri, 20 Dec 2002 23:10:58 +0000
Subject: [PATCH] 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 | 1 -
libavformat/asf.c | 4 ++--
libavformat/mpeg.c | 6 +++---
libavformat/rm.c | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index 1b9552d1d49..598d47f297a 100644
--- a/ffserver.c
+++ b/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");
diff --git a/libavformat/asf.c b/libavformat/asf.c
index 9c327133b2d..79d720819b4 100644
--- a/libavformat/asf.c
+++ b/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
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 748841881d7..e3c458c5601 100644
--- a/libavformat/mpeg.c
+++ b/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,
diff --git a/libavformat/rm.c b/libavformat/rm.c
index 72bd6978c1e..e3592fb2b64 100644
--- a/libavformat/rm.c
+++ b/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,
--
GitLab