From a717f9904227d7979473bad40c50eb40af41d01d Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Sun, 20 Jan 2013 01:59:08 +0200 Subject: mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The lavf-internal parser functions are used when receiving mpegts over RTP. This fixes memory leaks in this setup. The normal mpegts demuxer close function was updated in ec7d0d2e in 2004 to fix leaks, but the parsing function used for RTP wasn't updated and has been leaking ever since. Signed-off-by: Martin Storsjö --- libavformat/mpegts.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'libavformat/mpegts.c') diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 7c4d447ddc..399b0743ce 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2029,16 +2029,20 @@ static int mpegts_read_packet(AVFormatContext *s, return ret; } -static int mpegts_read_close(AVFormatContext *s) +static void mpegts_free(MpegTSContext *ts) { - MpegTSContext *ts = s->priv_data; int i; clear_programs(ts); for(i=0;ipids[i]) mpegts_close_filter(ts, ts->pids[i]); +} +static int mpegts_read_close(AVFormatContext *s) +{ + MpegTSContext *ts = s->priv_data; + mpegts_free(ts); return 0; } @@ -2150,10 +2154,7 @@ int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, void ff_mpegts_parse_close(MpegTSContext *ts) { - int i; - - for(i=0;ipids[i]); + mpegts_free(ts); av_free(ts); } -- cgit v1.2.3