From 9e99f84f7d4fabbbf224da152eacd8f4a50b7bd3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Mon, 27 Dec 2010 09:56:19 +0000 Subject: [PATCH] rtsp: Check if the rtp stream actually has an RTPDemuxContext For example MS-RTSP doesn't have RTPDemuxContexts for all streams. This fixes issue 2448. Originally committed as revision 26107 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 48ed6b5..8c9d79c 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1557,7 +1557,10 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt) int64_t first_queue_time = 0; for (i = 0; i < rt->nb_rtsp_streams; i++) { RTPDemuxContext *rtpctx = rt->rtsp_streams[i]->transport_priv; - int64_t queue_time = ff_rtp_queued_packet_time(rtpctx); + int64_t queue_time; + if (!rtpctx) + continue; + queue_time = ff_rtp_queued_packet_time(rtpctx); if (queue_time && (queue_time - first_queue_time < 0 || !first_queue_time)) { first_queue_time = queue_time; -- 2.7.4