diff options
| author | Martin Storsjö <martin@martin.st> | 2011-02-02 11:08:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-04 03:10:10 +0100 |
| commit | c6347bdf08db4b4893482f3136555d1a84a19347 (patch) | |
| tree | 39f4b3c1030f8861e3d0bbe22fdfc3bdc59ac385 /libavformat/rtspenc.c | |
| parent | 4a908866a1356e0a09a0895f0766388f4b4bef52 (diff) | |
| download | ffmpeg-c6347bdf08db4b4893482f3136555d1a84a19347.tar.gz | |
rtsp: Don't store RTSPStream in AVStream->priv_data
For mpegts in RTP, there isn't a direct mapping between RTSPStreams
and AVStreams, and the RTSPStream isn't ever stored in
AVStream->priv_data, which was earlier leaked. The fix for this
leak, in ea7f080749d68a431226ce196014da38761a0d82, lead to
double frees for other, normal RTP streams.
This patch avoids storing RTSPStreams in AVStream->priv_data, thus
avoiding the double free. The RTSPStreams are always available via
RTSPState->rtsp_streams anyway.
Tested with MS-RTSP, RealRTSP, DSS and mpegts/RTP.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit d9c0510e22821baa364306d867ffac45da0620c8)
Diffstat (limited to 'libavformat/rtspenc.c')
| -rw-r--r-- | libavformat/rtspenc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c index d54be1a5c2..34deeeb636 100644 --- a/libavformat/rtspenc.c +++ b/libavformat/rtspenc.c @@ -79,14 +79,12 @@ int ff_rtsp_setup_output_streams(AVFormatContext *s, const char *addr) /* Set up the RTSPStreams for each AVStream */ for (i = 0; i < s->nb_streams; i++) { RTSPStream *rtsp_st; - AVStream *st = s->streams[i]; rtsp_st = av_mallocz(sizeof(RTSPStream)); if (!rtsp_st) return AVERROR(ENOMEM); dynarray_add(&rt->rtsp_streams, &rt->nb_rtsp_streams, rtsp_st); - st->priv_data = rtsp_st; rtsp_st->stream_index = i; av_strlcpy(rtsp_st->control_url, rt->control_uri, sizeof(rtsp_st->control_url)); |