RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity

rtsp: Reorganize if statements in rtsp_read_play

Browse Source 
Originally committed as revision 25290 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-10-01 17:44:18 +00:00
parent ad4ad27fb6
commit 38f8c80b62
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtsp.c
View File

@ -1261,7 +1261,7 @@ static int rtsp_read_play(AVFormatContext *s)
if (reply->status_code != RTSP_STATUS_OK) { if (reply->status_code != RTSP_STATUS_OK) {
return -1; return -1;
} }
if (reply->range_start != AV_NOPTS_VALUE && if (
rt->transport == RTSP_TRANSPORT_RTP) { rt->transport == RTSP_TRANSPORT_RTP) {
for (i = 0; i < rt->nb_rtsp_streams; i++) { for (i = 0; i < rt->nb_rtsp_streams; i++) {
RTSPStream *rtsp_st = rt->rtsp_streams[i]; RTSPStream *rtsp_st = rt->rtsp_streams[i];
@ -1271,6 +1271,7 @@ static int rtsp_read_play(AVFormatContext *s)
continue; continue;
if (rtsp_st->stream_index >= 0) if (rtsp_st->stream_index >= 0)
st = s->streams[rtsp_st->stream_index]; st = s->streams[rtsp_st->stream_index];
if (reply->range_start != AV_NOPTS_VALUE) {
rtpctx->last_rtcp_ntp_time = AV_NOPTS_VALUE; rtpctx->last_rtcp_ntp_time = AV_NOPTS_VALUE;
rtpctx->first_rtcp_ntp_time = AV_NOPTS_VALUE; rtpctx->first_rtcp_ntp_time = AV_NOPTS_VALUE;
if (st) if (st)
@ -1280,6 +1281,7 @@ static int rtsp_read_play(AVFormatContext *s)
} }
} }
} }
}
rt->state = RTSP_STATE_STREAMING; rt->state = RTSP_STATE_STREAMING;
return 0; return 0;
} }