Revision c6c11cb6

View differences:

ffserver.c
1489 1489
        c->wmp_client_id = random() & 0x7fffffff;
1490 1490

  
1491 1491
        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);
1492
        mime_type = "application/octet-stream"; 
1493 1492
    }
1494 1493
    q += sprintf(q, "Content-Type: %s\r\n", mime_type);
1495 1494
    q += sprintf(q, "\r\n");
libavformat/asf.c
1217 1217
static AVOutputFormat asf_oformat = {
1218 1218
    "asf",
1219 1219
    "asf format",
1220
    "application/octet-stream",
1220
    "video/x-ms-asf",
1221 1221
    "asf,wmv",
1222 1222
    sizeof(ASFContext),
1223 1223
#ifdef CONFIG_MP3LAME
......
1234 1234
static AVOutputFormat asf_stream_oformat = {
1235 1235
    "asf_stream",
1236 1236
    "asf format",
1237
    "application/octet-stream",
1237
    "video/x-ms-asf",
1238 1238
    "asf,wmv",
1239 1239
    sizeof(ASFContext),
1240 1240
#ifdef CONFIG_MP3LAME
libavformat/mpeg.c
628 628
static AVOutputFormat mpeg1system_mux = {
629 629
    "mpeg",
630 630
    "MPEG1 System format",
631
    "video/x-mpeg",
631
    "video/mpeg",
632 632
    "mpg,mpeg",
633 633
    sizeof(MpegMuxContext),
634 634
    CODEC_ID_MP2,
......
641 641
static AVOutputFormat mpeg1vcd_mux = {
642 642
    "vcd",
643 643
    "MPEG1 System format (VCD)",
644
    "video/x-mpeg",
644
    "video/mpeg",
645 645
    NULL,
646 646
    sizeof(MpegMuxContext),
647 647
    CODEC_ID_MP2,
......
654 654
static AVOutputFormat mpeg2vob_mux = {
655 655
    "vob",
656 656
    "MPEG2 PS format (VOB)",
657
    "video/x-mpeg",
657
    "video/mpeg",
658 658
    "vob",
659 659
    sizeof(MpegMuxContext),
660 660
    CODEC_ID_MP2,
libavformat/rm.c
756 756
static AVOutputFormat rm_oformat = {
757 757
    "rm",
758 758
    "rm format",
759
    "audio/x-pn-realaudio",
759
    "application/vnd.rn-realmedia",
760 760
    "rm,ra",
761 761
    sizeof(RMContext),
762 762
    CODEC_ID_AC3,

Also available in: Unified diff