diff options
| author | Ryutaroh Matsumoto <ryutaroh@it.ss.titech.ac.jp> | 2002-12-20 23:10:58 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-12-20 23:10:58 +0000 |
| commit | c6c11cb6c620af1e4d4d96b373456b83cfec1ae5 (patch) | |
| tree | 4c1bdbee1236377c8c57c7bcc19c0ce4096560bb /libavformat/mpeg.c | |
| parent | 732d9245c936a2e1ed298e4fae9c31e53bfde777 (diff) | |
| download | ffmpeg-streaming-c6c11cb6c620af1e4d4d96b373456b83cfec1ae5.zip ffmpeg-streaming-c6c11cb6c620af1e4d4d96b373456b83cfec1ae5.tar.gz | |
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
Diffstat (limited to 'libavformat/mpeg.c')
| -rw-r--r-- | libavformat/mpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 7488418..e3c458c 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, |
