diff options
| author | Martin Storsjö <martin@martin.st> | 2011-02-11 23:36:47 +0200 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-11 16:58:19 -0500 |
| commit | b2dd842d21a0b441bb9f7092357f479beb6b6f69 (patch) | |
| tree | b7ca221a40f106683f166f4589e72a0dfd8d5b60 /libavformat/rtspdec.c | |
| parent | 74b1f96859eb967222fcb3eb4c72d949b5165a89 (diff) | |
| download | ffmpeg-b2dd842d21a0b441bb9f7092357f479beb6b6f69.tar.gz | |
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 <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/rtspdec.c')
| -rw-r--r-- | libavformat/rtspdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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, ",", |