[FFmpeg-cvslog] r25290 - trunk/libavformat/rtsp.c

[mstorsjo]

Author: mstorsjo
Date: Fri Oct  1 19:44:18 2010
New Revision: 25290

Log:
rtsp: Reorganize if statements in rtsp_read_play

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Fri Oct  1 19:43:27 2010	(r25289)
+++ trunk/libavformat/rtsp.c	Fri Oct  1 19:44:18 2010	(r25290)
@@ -1261,7 +1261,7 @@ static int rtsp_read_play(AVFormatContex
         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(AVFormatContex
                     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);
+                }
             }
         }
     }