Update LGPL license blurb, choosing v2.1+.

[vlc] / modules / access / dvdread.c

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 6c81daa39e22381f10df6c8a2694688490c2dcc6..e703abc315ef1758e609aa52f7171383826a99bb 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -48,19 +48,11 @@
 
 #include <sys/types.h>
 
-#ifdef HAVE_DVDREAD_DVD_READER_H
-  #include <dvdread/dvd_reader.h>
-  #include <dvdread/ifo_types.h>
-  #include <dvdread/ifo_read.h>
-  #include <dvdread/nav_read.h>
-  #include <dvdread/nav_print.h>
-#else
-  #include <libdvdread/dvd_reader.h>
-  #include <libdvdread/ifo_types.h>
-  #include <libdvdread/ifo_read.h>
-  #include <libdvdread/nav_read.h>
-  #include <libdvdread/nav_print.h>
-#endif
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
+#include <dvdread/nav_print.h>
 
 #include <assert.h>
 
@@ -274,7 +266,7 @@ static void Close( vlc_object_t *p_this )
     /* Free the array of titles */
     for( int i = 0; i < p_sys->i_titles; i++ )
         vlc_input_title_Delete( p_sys->titles[i] );
-    TAB_CLEAN( p_sys->i_title, p_sys->titles );
+    TAB_CLEAN( p_sys->i_titles, p_sys->titles );
 
     /* Close libdvdread */
     if( p_sys->p_title ) DVDCloseFile( p_sys->p_title );