diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-10-26 21:47:29 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-10-26 21:47:29 +0000 |
| commit | a746b7f41bce5f3c67e7bc70fe02d51fbee7ffd2 (patch) | |
| tree | a28db50d18871dc31efe88dc8e3aa91ab2f451c6 /src | |
| parent | ca193cadb3eac686ee377685c3f90a9ae2831f87 (diff) | |
| download | xine-lib-a746b7f41bce5f3c67e7bc70fe02d51fbee7ffd2.tar.gz xine-lib-a746b7f41bce5f3c67e7bc70fe02d51fbee7ffd2.tar.bz2 | |
don't forget to call stop during dispose
CVS patchset: 3023
CVS date: 2002/10/26 21:47:29
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index ae16a2e76..98bbceafd 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.128 2002/10/26 10:02:42 tmattern Exp $ + * $Id: demux_mpeg_block.c,v 1.129 2002/10/26 21:47:29 mroi Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -821,14 +821,6 @@ static int demux_mpeg_block_estimate_rate (demux_mpeg_block_t *this) { } -static void demux_mpeg_block_dispose (demux_plugin_t *this_gen) { - - demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen; - free (this->scratch_base); - free (this); - -} - static void demux_mpeg_block_stop (demux_plugin_t *this_gen) { demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen; @@ -853,6 +845,15 @@ static void demux_mpeg_block_stop (demux_plugin_t *this_gen) { xine_demux_control_end(this->stream, BUF_FLAG_END_USER); } +static void demux_mpeg_block_dispose (demux_plugin_t *this_gen) { + + demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen; + demux_mpeg_block_stop(this_gen); + free (this->scratch_base); + free (this); + +} + static int demux_mpeg_block_get_status (demux_plugin_t *this_gen) { demux_mpeg_block_t *this = (demux_mpeg_block_t *) this_gen; |