[FFmpeg-cvslog] r23228 - in branches/0.6: . libavformat/rtsp.c

siretart subversion
Fri May 21 22:22:18 CEST 2010


Author: siretart
Date: Fri May 21 22:22:18 2010
New Revision: 23228

Log:
Fix a crash when opening WMS RTSP streams
Fixes issue 1948


backport r23181 by mstorsjo

Modified:
   branches/0.6/   (props changed)
   branches/0.6/libavformat/rtsp.c

Modified: branches/0.6/libavformat/rtsp.c
==============================================================================
--- branches/0.6/libavformat/rtsp.c	Fri May 21 22:20:01 2010	(r23227)
+++ branches/0.6/libavformat/rtsp.c	Fri May 21 22:22:18 2010	(r23228)
@@ -1337,6 +1337,8 @@ static int rtsp_read_play(AVFormatContex
                 RTSPStream *rtsp_st = rt->rtsp_streams[i];
                 RTPDemuxContext *rtpctx = rtsp_st->transport_priv;
                 AVStream *st = NULL;
+                if (!rtpctx)
+                    continue;
                 if (rtsp_st->stream_index >= 0)
                     st = s->streams[rtsp_st->stream_index];
                 rtpctx->last_rtcp_ntp_time  = AV_NOPTS_VALUE;



More information about the ffmpeg-cvslog mailing list