summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_asf.c19
-rw-r--r--src/demuxers/demux_mpgaudio.c7
2 files changed, 16 insertions, 10 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 5b6f0492c..090291203 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.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_asf.c,v 1.64 2002/10/20 16:18:06 guenter Exp $
+ * $Id: demux_asf.c,v 1.65 2002/10/20 23:54:20 guenter Exp $
*
* demultiplexer for asf streams
*
@@ -1170,13 +1170,6 @@ static void *demux_asf_loop (void *this_gen) {
return NULL;
}
-static void demux_asf_dispose (demux_plugin_t *this_gen) {
-
- demux_asf_t *this = (demux_asf_t *) this_gen;
- free (this);
-
-}
-
static void demux_asf_stop (demux_plugin_t *this_gen) {
demux_asf_t *this = (demux_asf_t *) this_gen;
@@ -1209,6 +1202,16 @@ static void demux_asf_stop (demux_plugin_t *this_gen) {
}
}
+static void demux_asf_dispose (demux_plugin_t *this_gen) {
+
+ demux_asf_t *this = (demux_asf_t *) this_gen;
+
+ demux_asf_stop (this_gen);
+
+ free (this);
+
+}
+
static int demux_asf_get_status (demux_plugin_t *this_gen) {
demux_asf_t *this = (demux_asf_t *) this_gen;
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index ea3c25ad7..69c6ada14 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.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_mpgaudio.c,v 1.68 2002/10/20 21:15:07 guenter Exp $
+ * $Id: demux_mpgaudio.c,v 1.69 2002/10/20 23:54:20 guenter Exp $
*
* demultiplexer for mpeg audio (i.e. mp3) streams
*
@@ -333,7 +333,7 @@ static void *demux_mpgaudio_loop (void *this_gen) {
/* main demuxer loop */
while(this->status == DEMUX_OK) {
-
+
if (!demux_mpgaudio_next (this, 0))
this->status = DEMUX_FINISHED;
@@ -546,6 +546,9 @@ static int demux_mpgaudio_seek (demux_plugin_t *this_gen,
}
static void demux_mpgaudio_dispose (demux_plugin_t *this) {
+
+ demux_mpgaudio_stop (this);
+
free (this);
}