From 6c1355be967751b194504ed73b053846fbae5fa9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 20 Feb 2015 21:08:10 +0100 Subject: demux: add free_demuxer_and_stream() function Although their lifetimes are conceptually different, it happens often that a demuxer is destroyed together with its stream. --- demux/demux.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'demux/demux.c') diff --git a/demux/demux.c b/demux/demux.c index 8af76daa1f..b10b0d6f45 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -245,6 +245,15 @@ void free_demuxer(demuxer_t *demuxer) talloc_free(demuxer); } +void free_demuxer_and_stream(struct demuxer *demuxer) +{ + if (!demuxer) + return; + struct stream *s = demuxer->stream; + free_demuxer(demuxer); + free_stream(s); +} + // Start the demuxer thread, which reads ahead packets on its own. void demux_start_thread(struct demuxer *demuxer) { -- cgit v1.2.3