OSDN Git Service

rtsp/rdt: Assign the RTSPStream index to AVStream->id
authorMartin Storsjö <martin@martin.st>
Fri, 11 Feb 2011 21:36:47 +0000 (23:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Feb 2011 23:54:05 +0000 (00:54 +0100)
commitae9c5ea2addf54a4b5d0a39f0728801e55226dfa
treeba51bcf9b7e5d1732e1d113da5ac5b2d2fe65b6d
parentb7195837cddc22dc41078c77e5c37928eec116f8
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)
libavformat/rdt.c
libavformat/rtsp.c
libavformat/rtspdec.c