[MPlayer-cvslog] CVS: main/libmpdemux demuxer.c, 1.197, 1.198 demux_demuxers.c, 1.5, 1.6

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv29748/libmpdemux

Modified Files:
	demuxer.c demux_demuxers.c 
Log Message:
Do not free demuxer before using demuxer->desc->type (happened when using -audiofile).


Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- demuxer.c	11 Aug 2005 17:01:13 -0000	1.197
+++ demuxer.c	23 Aug 2005 08:03:26 -0000	1.198
@@ -260,7 +260,7 @@
       demuxer->desc->close(demuxer);
     // Very ugly hack to make it behave like old implementation
     if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS)
-      return;
+      goto skip_streamfree;
     // free streams:
     for(i = 0; i < MAX_A_STREAMS; i++)
 	if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]);
@@ -272,6 +272,7 @@
     free_demuxer_stream(demuxer->audio);
     free_demuxer_stream(demuxer->video);
     free_demuxer_stream(demuxer->sub);
+skip_streamfree:
     if(demuxer->info) {
       for(i=0;demuxer->info[i] != NULL; i++)
 	free(demuxer->info[i]);

Index: demux_demuxers.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_demuxers.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- demux_demuxers.c	5 Aug 2005 19:57:46 -0000	1.5
+++ demux_demuxers.c	23 Aug 2005 08:03:26 -0000	1.6
@@ -104,12 +104,6 @@
   }
 
   free(priv);
-  if(demuxer->info) {
-    for(i=0;demuxer->info[i] != NULL; i++)
-      free(demuxer->info[i]);
-    free(demuxer->info);
-  }
-  free(demuxer);
 }