Revision b156b88c ffserver.c

View differences:

ffserver.c
1627 1627
                    strcpy(eosf - 4, ".asx");
1628 1628
                else if (strcmp(eosf - 3, ".rm") == 0)
1629 1629
                    strcpy(eosf - 3, ".ram");
1630
                else if (stream->fmt == &rtp_muxer) {
1630
                else if (!strcmp(stream->fmt->name, "rtp")) {
1631 1631
                    /* generate a sample RTSP director if
1632 1632
                       unicast. Generate an SDP redirector if
1633 1633
                       multicast */
......
2683 2683
        path++;
2684 2684

  
2685 2685
    for(stream = first_stream; stream != NULL; stream = stream->next) {
2686
        if (!stream->is_feed && stream->fmt == &rtp_muxer &&
2686
        if (!stream->is_feed && !strcmp(stream->fmt->name, "rtp") &&
2687 2687
            !strcmp(path, stream->filename)) {
2688 2688
            goto found;
2689 2689
        }
......
2758 2758

  
2759 2759
    /* now check each stream */
2760 2760
    for(stream = first_stream; stream != NULL; stream = stream->next) {
2761
        if (!stream->is_feed && stream->fmt == &rtp_muxer) {
2761
        if (!stream->is_feed && !strcmp(stream->fmt->name, "rtp")) {
2762 2762
            /* accept aggregate filenames only if single stream */
2763 2763
            if (!strcmp(path, stream->filename)) {
2764 2764
                if (stream->nb_streams != 1) {
......
3076 3076
    ctx = av_alloc_format_context();
3077 3077
    if (!ctx)
3078 3078
        return -1;
3079
    ctx->oformat = &rtp_muxer;
3079
    ctx->oformat = guess_format("rtp", NULL, NULL);
3080 3080

  
3081 3081
    st = av_mallocz(sizeof(AVStream));
3082 3082
    if (!st)
......
3295 3295
            /* try to open the file */
3296 3296
            /* open stream */
3297 3297
            stream->ap_in = av_mallocz(sizeof(AVFormatParameters));
3298
            if (stream->fmt == &rtp_muxer) {
3298
            if (!strcmp(stream->fmt->name, "rtp")) {
3299 3299
                /* specific case : if transport stream output to RTP,
3300 3300
                   we use a raw transport stream reader */
3301 3301
                stream->ap_in->mpeg2ts_raw = 1;

Also available in: Unified diff