diff options
| author | Martin Storsjö <martin@martin.st> | 2010-02-19 16:26:21 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-02-19 16:26:21 +0000 |
| commit | c02fd3d2e886bcdc82ad52972376310156040c38 (patch) | |
| tree | d4ebac97c03524ef5736ff0f443cf6f4cdbf04f7 /libavformat/rtsp.c | |
| parent | aa170ed62563479beb8e4e3b74bdcead35cbc366 (diff) | |
Rename RTSP_STATE_PLAYING to _STREAMING, since that better covers the
future use of the rtsp* codebase for RTSP muxing.
Patch by Martin Storsjö <$firstname $firstname st>.
Originally committed as revision 21896 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a6584d33fb..c02bdbb4b1 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1249,7 +1249,7 @@ static int rtsp_read_play(AVFormatContext *s) return -1; } } - rt->state = RTSP_STATE_PLAYING; + rt->state = RTSP_STATE_STREAMING; return 0; } @@ -1488,7 +1488,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st, rtsp_read_reply(s, &reply, NULL, 0); /* XXX: parse message */ - if (rt->state != RTSP_STATE_PLAYING) + if (rt->state != RTSP_STATE_STREAMING) return 0; } #endif @@ -1516,7 +1516,7 @@ redo: if (ret == 1) /* received '$' */ break; /* XXX: parse message */ - if (rt->state != RTSP_STATE_PLAYING) + if (rt->state != RTSP_STATE_STREAMING) return 0; } ret = url_read_complete(rt->rtsp_hd, buf, 3); @@ -1667,7 +1667,7 @@ static int rtsp_read_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR_INVALIDDATA; rt->need_subscription = 0; - if (rt->state == RTSP_STATE_PLAYING) + if (rt->state == RTSP_STATE_STREAMING) rtsp_read_play (s); } } @@ -1702,7 +1702,7 @@ static int rtsp_read_pause(AVFormatContext *s) rt = s->priv_data; - if (rt->state != RTSP_STATE_PLAYING) + if (rt->state != RTSP_STATE_STREAMING) return 0; else if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) { snprintf(cmd, sizeof(cmd), @@ -1729,7 +1729,7 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index, default: case RTSP_STATE_IDLE: break; - case RTSP_STATE_PLAYING: + case RTSP_STATE_STREAMING: if (rtsp_read_pause(s) != 0) return -1; rt->state = RTSP_STATE_SEEKING; |