[MPlayer-cvslog] CVS: main/libmpdemux demux_ogg.c,1.69,1.70

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	demux_ogg.c 
Log Message:
Fix the memleak fix: in case of error, demux_close_ogg should be called
only once and demuxer->priv be freed.


Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- demux_ogg.c	1 May 2005 10:40:42 -0000	1.69
+++ demux_ogg.c	2 May 2005 07:59:12 -0000	1.70
@@ -756,6 +756,7 @@
   clear_sub = -1;
   s = demuxer->stream;
 
+  demuxer->priv =
   ogg_d = (ogg_demuxer_t*)calloc(1,sizeof(ogg_demuxer_t));
   sync = &ogg_d->sync;
   page = &ogg_d->page;
@@ -1076,9 +1077,6 @@
     goto err_out;
   }
 
-  /// Finish to setup the demuxer
-  demuxer->priv = ogg_d;
-
   if(!n_video || (video_id < 0))
     demuxer->video->id = -2;
   else
@@ -1112,7 +1110,6 @@
   return 1;
 
 err_out:
-  demux_close_ogg(demuxer);
   return 0;
 }