Skip to content

F
ffmpeg
Commit 70d25268 authored by Aman Gupta's avatar Aman Gupta
Browse files
Options

avformat/mpegts: fix memory leak with merge_pmt_versions=1 

Signed-off-by: 's avatarAman Gupta <aman@tmm1.net>
parent fc2daf36
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
libavformat/mpegts.c
View file @ 70d25268
...@@ -247,6 +247,7 @@ typedef struct PESContext { ...@@ -247,6 +247,7 @@ typedef struct PESContext {
uint8_t header[MAX_PES_HEADER_SIZE]; uint8_t header[MAX_PES_HEADER_SIZE];
AVBufferRef *buffer; AVBufferRef *buffer;
SLConfigDescr sl; SLConfigDescr sl;
int merged_st;
} PESContext; } PESContext;
extern AVInputFormat ff_mpegts_demuxer; extern AVInputFormat ff_mpegts_demuxer;
...@@ -550,8 +551,8 @@ static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter) ...@@ -550,8 +551,8 @@ static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
PESContext *pes = filter->u.pes_filter.opaque; PESContext *pes = filter->u.pes_filter.opaque;
av_buffer_unref(&pes->buffer); av_buffer_unref(&pes->buffer);
/* referenced private data will be freed later in /* referenced private data will be freed later in
* avformat_close_input */ * avformat_close_input (pes->st->priv_data == pes) */
if (!((PESContext *)filter->u.pes_filter.opaque)->st) { if (!pes->st || pes->merged_st) {
av_freep(&filter->u.pes_filter.opaque); av_freep(&filter->u.pes_filter.opaque);
} }
} }
...@@ -2190,6 +2191,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len ...@@ -2190,6 +2191,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (st) { if (st) {
pes->st = st; pes->st = st;
pes->stream_type = stream_type; pes->stream_type = stream_type;
pes->merged_st = 1;
} }
} }
if (!pes->st) { if (!pes->st) {
...@@ -2211,6 +2213,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len ...@@ -2211,6 +2213,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (st) { if (st) {
pes->st = st; pes->st = st;
pes->stream_type = stream_type; pes->stream_type = stream_type;
pes->merged_st = 1;
} }
} }
if (pes && !pes->st) { if (pes && !pes->st) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment