From b2dd842d21a0b441bb9f7092357f479beb6b6f69 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 11 Feb 2011 23:36:47 +0200 Subject: rtsp/rdt: Assign the RTSPStream index to AVStream->id This is used for mapping AVStreams back to their corresponding RTSPStream. Since d9c0510, the RTSPStream pointer isn't stored in AVStream->priv_data any longer, breaking this mapping from AVStreams to RTSPStreams. Also, we don't need to clear the priv_data in rdt cleanup any longer, since it isn't set to duplicate pointers. Signed-off-by: Ronald S. Bultje --- libavformat/rtspdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/rtspdec.c') diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 45ed7bb9bb..e484347896 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -283,7 +283,7 @@ retry: for (i = 0; i < rt->nb_rtsp_streams; i++) { rule_nr = 0; for (r = 0; r < s->nb_streams; r++) { - if (s->streams[r]->priv_data == rt->rtsp_streams[i]) { + if (s->streams[r]->id == i) { if (s->streams[r]->discard != AVDISCARD_ALL) { if (!first) av_strlcat(rt->last_subscription, ",", -- cgit v1.2.3