[MPlayer-cvslog] CVS: main/libmpdemux stream_dvd.c,1.9,1.10

Nicolas Plourde CVS syncmail at mplayerhq.hu
Fri Jan 27 04:07:16 CET 2006


CVS change done by Nicolas Plourde CVS

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

Modified Files:
	stream_dvd.c 
Log Message:
MPlayer OSX port: Add a call to UDFFindFile to verify that we are opening a valid udf image. Patch by Emanuele Giaquita <emanuele.giaquinta at gmail.com>

Index: stream_dvd.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream_dvd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- stream_dvd.c	28 Dec 2005 12:34:20 -0000	1.9
+++ stream_dvd.c	27 Jan 2006 03:07:13 -0000	1.10
@@ -465,8 +465,17 @@
         if(!dvd) {
           mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,temp_device);
         } else {
+#if DVDREAD_VERSION <= LIBDVDREAD_VERSION(0,9,4)
+          int len;
+          if(!UDFFindFile(dvd,"/",&len)) {
+            mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CantOpenDVD,temp_device);
+            DVDClose(dvd);
+          } else
+#endif
+          {
           free(temp_device);
           break;
+          }
         }
       }
 




More information about the MPlayer-cvslog mailing list