Revision b156b88c

View differences:

ffplay.c
1974 1974
                av_read_play(ic);
1975 1975
        }
1976 1976
#ifdef CONFIG_RTSP_DEMUXER
1977
        if (is->paused && ic->iformat == &rtsp_demuxer) {
1977
        if (is->paused && !strcmp(ic->iformat->name, "rtsp")) {
1978 1978
            /* wait 10 ms to avoid trying to get another packet */
1979 1979
            /* XXX: horrible */
1980 1980
            SDL_Delay(10);
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;
libavformat/allformats.h
95 95
extern AVInputFormat redir_demuxer;
96 96
extern AVInputFormat rm_demuxer;
97 97
extern AVInputFormat roq_demuxer;
98
extern AVInputFormat rtp_demuxer;
99
extern AVInputFormat rtsp_demuxer;
98 100
extern AVInputFormat sdp_demuxer;
99 101
extern AVInputFormat segafilm_demuxer;
100 102
extern AVInputFormat shorten_demuxer;
......
176 178
extern AVOutputFormat pcm_u8_muxer;
177 179
extern AVOutputFormat psp_muxer;
178 180
extern AVOutputFormat rawvideo_muxer;
181
extern AVOutputFormat rtp_muxer;
179 182
extern AVOutputFormat rm_muxer;
180 183
extern AVOutputFormat roq_muxer;
181 184
extern AVOutputFormat swf_muxer;
libavformat/rtp.h
40 40
                     const uint8_t *buf, int len);
41 41
void rtp_parse_close(RTPDemuxContext *s);
42 42

  
43
extern AVOutputFormat rtp_muxer;
44
extern AVInputFormat rtp_demuxer;
45

  
46 43
int rtp_get_local_port(URLContext *h);
47 44
int rtp_set_remote_url(URLContext *h, const char *uri);
48 45
void rtp_get_file_handles(URLContext *h, int *prtp_fd, int *prtcp_fd);
libavformat/rtsp.h
84 84
extern int rtsp_default_protocols;
85 85
extern int rtsp_rtp_port_min;
86 86
extern int rtsp_rtp_port_max;
87
extern AVInputFormat rtsp_demuxer;
88 87

  
89 88
int rtsp_pause(AVFormatContext *s);
90 89
int rtsp_resume(AVFormatContext *s);

Also available in: Unified diff