diff options
| author | Martin Storsjö <martin@martin.st> | 2011-02-11 23:36:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-13 00:54:05 +0100 |
| commit | ae9c5ea2addf54a4b5d0a39f0728801e55226dfa (patch) | |
| tree | ba51bcf9b7e5d1732e1d113da5ac5b2d2fe65b6d /libavformat/rtsp.c | |
| parent | b7195837cddc22dc41078c77e5c37928eec116f8 (diff) | |
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>
(cherry picked from commit b2dd842d21a0b441bb9f7092357f479beb6b6f69)
Diffstat (limited to 'libavformat/rtsp.c')
| -rw-r--r-- | libavformat/rtsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index d3e88e9a5c..41427ae08e 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -322,7 +322,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, if (!strcmp(ff_rtp_enc_name(rtsp_st->sdp_payload_type), "MP2T")) { /* no corresponding stream */ } else { - st = av_new_stream(s, 0); + st = av_new_stream(s, rt->nb_rtsp_streams - 1); if (!st) return; rtsp_st->stream_index = st->index; |