generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Originally committed as revision 1352 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ryutaroh Matsumoto 2002-12-20 23:10:58 +00:00 committed by Michael Niedermayer
parent 732d9245c9
commit c6c11cb6c6
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ffserver.c
View File

@ -1489,7 +1489,6 @@ static int http_parse_request(HTTPContext *c)
c->wmp_client_id = random() & 0x7fffffff; 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); 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, "Content-Type: %s\r\n", mime_type);
q += sprintf(q, "\r\n"); q += sprintf(q, "\r\n");

4
libavformat/asf.c
View File

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

6
libavformat/mpeg.c
View File

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

2
libavformat/rm.c
View File

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