Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv26509/libmpdemux Modified Files: stream.c open.c Log Message: Add uninit to the dvd stream. Index: stream.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- stream.c 11 Jun 2002 14:29:51 -0000 1.37 +++ stream.c 21 Jun 2002 16:26:40 -0000 1.38 @@ -278,10 +278,17 @@ waitpid(s->cache_pid,NULL,0); } if(s->fd>0) close(s->fd); + switch(s->type) { #ifdef HAVE_CDDA - if(s->type == STREAMTYPE_CDDA) + case STREAMTYPE_CDDA: close_cdda(s); + break; #endif +#ifdef USE_DVDREAD + case STREAMTYPE_DVD: + dvd_close(s->priv); +#endif + } if(s->priv) free(s->priv); free(s); } Index: open.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- open.c 21 Jun 2002 06:15:36 -0000 1.46 +++ open.c 21 Jun 2002 16:26:40 -0000 1.47 @@ -686,4 +686,11 @@ } +void dvd_close(dvd_priv_t *d) { + ifoClose(d->vts_file); + ifoClose(d->vmg_file); + DVDCloseFile(d->title); + DVDClose(d->dvd); +} + #endif