From 38f8c80b62f62ef5c7ab12e2461c020a6166bc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 1 Oct 2010 17:44:18 +0000 Subject: [PATCH] rtsp: Reorganize if statements in rtsp_read_play Originally committed as revision 25290 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index b1ef46f6d0..505a11eacb 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1261,7 +1261,7 @@ static int rtsp_read_play(AVFormatContext *s) if (reply->status_code != RTSP_STATUS_OK) { return -1; } - if (reply->range_start != AV_NOPTS_VALUE && + if ( rt->transport == RTSP_TRANSPORT_RTP) { for (i = 0; i < rt->nb_rtsp_streams; i++) { RTSPStream *rtsp_st = rt->rtsp_streams[i]; @@ -1271,12 +1271,14 @@ static int rtsp_read_play(AVFormatContext *s) continue; if (rtsp_st->stream_index >= 0) st = s->streams[rtsp_st->stream_index]; + if (reply->range_start != AV_NOPTS_VALUE) { rtpctx->last_rtcp_ntp_time = AV_NOPTS_VALUE; rtpctx->first_rtcp_ntp_time = AV_NOPTS_VALUE; if (st) rtpctx->range_start_offset = av_rescale_q(reply->range_start, AV_TIME_BASE_Q, st->time_base); + } } } }