rtsp: Simplify code
authorMartin Storsjö <martin@martin.st>
Wed, 5 Jan 2011 21:22:50 +0000 (21:22 +0000)
committerMartin Storsjö <martin@martin.st>
Wed, 5 Jan 2011 21:22:50 +0000 (21:22 +0000)
Originally committed as revision 26234 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/rtspdec.c

index cdcef38..a7a7e2d 100644 (file)
@@ -67,21 +67,18 @@ static int rtsp_read_play(AVFormatContext *s)
         if (reply->status_code != RTSP_STATUS_OK) {
             return -1;
         }
-        if (rt->transport == RTSP_TRANSPORT_RTP) {
+        if (rt->transport == RTSP_TRANSPORT_RTP &&
+            reply->range_start != AV_NOPTS_VALUE) {
             for (i = 0; i < rt->nb_rtsp_streams; i++) {
                 RTSPStream *rtsp_st = rt->rtsp_streams[i];
                 RTPDemuxContext *rtpctx = rtsp_st->transport_priv;
                 AVStream *st = NULL;
-                if (!rtpctx)
+                if (!rtpctx || rtsp_st->stream_index < 0)
                     continue;
-                if (rtsp_st->stream_index >= 0)
-                    st = s->streams[rtsp_st->stream_index];
-                if (reply->range_start != AV_NOPTS_VALUE) {
-                    if (st)
+                st = s->streams[rtsp_st->stream_index];
                         rtpctx->range_start_offset =
                             av_rescale_q(reply->range_start, AV_TIME_BASE_Q,
                                          st->time_base);
-                }
             }
         }
     }