summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2010-05-21 20:22:18 +0000
committerReinhard Tartler <siretart@tauware.de>2010-05-21 20:22:18 +0000
commit3588e6b7c5327eb0831d1b0fc4baf2ce96566b98 (patch)
tree2e8626bf3b30605685ad23b9de60fdae6f31d48d /libavformat
parent34a0dee17e924caec491e3a2002bdf743b3cacd3 (diff)
Fix a crash when opening WMS RTSP streams
Fixes issue 1948 backport r23181 by mstorsjo Originally committed as revision 23228 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rtsp.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index fec91f11b8..6dbd796d31 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1337,6 +1337,8 @@ static int rtsp_read_play(AVFormatContext *s)
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;