*) changed includes from

    #include <dvdread/...> to
    #include "..."

 *) Darwin doesn't have off64_t, stat64, lseek64. Added
    #ifdef SYS_DARWIN
    #define off64_t off_t
    ....
    #endif
    to dvdread.c

 *) Fixed stupid bug in vout_macos.x. On startup, it would
    try to free a non-existant QuickTime Sequence. This could be
    the reasons for (some?) of the crashes at startup.

diff --git a/extras/libdvdread/bswap.h b/extras/libdvdread/bswap.h
index 23e2863b474451eea1a3f09012afbb10574daaf7..7842632cae6c4620eb88bfa06c9c8840f5aa19d3 100644 (file)
--- a/extras/libdvdread/bswap.h
+++ b/extras/libdvdread/bswap.h
@@ -20,6 +20,7 @@
 #ifndef BSWAP_H_INCLUDED
 #define BSWAP_H_INCLUDED
 
+#include <defs.h>
 #include <config.h>
 
 #if defined(WORDS_BIGENDIAN)

diff --git a/extras/libdvdread/dvdread.c b/extras/libdvdread/dvdread.c
index 8c7ccceb5defdda2cd37dc901cbf15b52e558c33..50b83c2ac8785869a79bb015508a8287301f3f0b 100644 (file)
--- a/extras/libdvdread/dvdread.c
+++ b/extras/libdvdread/dvdread.c
@@ -3,7 +3,7 @@
  * (hard-linked) and adds a readv call function to tha API.
  *****************************************************************************
  * Copyright (C) 2001 Billy Biggs <vektor@dumbterm.net>.
- * $Id: dvdread.c,v 1.1 2001/11/25 05:04:38 stef Exp $
+ * $Id: dvdread.c,v 1.2 2001/11/26 22:28:05 fgp Exp $
  *
  * Author: Billy Biggs <vektor@dumbterm.net>
  *         Stéphane Borel <stef@via.ecp.fr>
@@ -33,13 +33,18 @@
 #include <string.h>
 #include <unistd.h>
 #include <limits.h>
-#include <dlfcn.h>
 #include <dirent.h>
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)
 #define SYS_BSD 1
 #endif
 
+#ifdef SYS_DARWIN
+#define off64_t off_t
+#define stat64 stat
+#define lseek64 lseek
+#endif
+
 #if defined(__sun)
 #include <sys/mnttab.h>
 #elif defined(SYS_BSD)

diff --git a/extras/libdvdread/ifo_print.h b/extras/libdvdread/ifo_print.h
index 97470a8945953eade0276496f24f72d503d4c418..3e69e8eeebd545f3c0ce6c4edbd6e773bd2a2294 100644 (file)
--- a/extras/libdvdread/ifo_print.h
+++ b/extras/libdvdread/ifo_print.h
@@ -20,8 +20,10 @@
 #ifndef IFO_PRINT_H_INCLUDED
 #define IFO_PRINT_H_INCLUDED
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+//#include <dvdread/ifo_types.h>
+//#include <dvdread/dvd_reader.h>
+#include "ifo_types.h"
+#include "dvd_reader.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/extras/libdvdread/ifo_read.h b/extras/libdvdread/ifo_read.h
index b1c20e90bbf32bdb77b778b18591a3526cd75bf8..0c067c38e114e1aa05e55c48b8170361283f330b 100644 (file)
--- a/extras/libdvdread/ifo_read.h
+++ b/extras/libdvdread/ifo_read.h
@@ -20,8 +20,10 @@
 #ifndef IFO_READ_H_INCLUDED
 #define IFO_READ_H_INCLUDED
 
-#include <dvdread/ifo_types.h>
-#include <dvdread/dvd_reader.h>
+//#include <dvdread/ifo_types.h>
+//#include <dvdread/dvd_reader.h>
+#include "ifo_types.h"
+#include "dvd_reader.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/extras/libdvdread/ifo_types.h b/extras/libdvdread/ifo_types.h
index fe87fbb84474c77b56bd6cd1076c5dd59b32e1ce..7d1e496209ea5e6f118499a0e22d9b2aa636ada5 100644 (file)
--- a/extras/libdvdread/ifo_types.h
+++ b/extras/libdvdread/ifo_types.h
@@ -21,7 +21,8 @@
 #define IFO_TYPES_H_INCLUDED
 
 #include <inttypes.h>
-#include <dvdread/dvd_reader.h>
+//#include <dvdread/dvd_reader.h>
+#include "dvd_reader.h"
 
 
 #undef ATTRIBUTE_PACKED

diff --git a/extras/libdvdread/nav_print.h b/extras/libdvdread/nav_print.h
index 53cc5146142abec5f3dbe2401e19c92580c53ae4..ce194084cf559784004fe9f134ce4b5d3e23ce4d 100644 (file)
--- a/extras/libdvdread/nav_print.h
+++ b/extras/libdvdread/nav_print.h
@@ -21,7 +21,8 @@
 #define NAV_PRINT_H_INCLUDED
 
 #include <stdio.h>
-#include <dvdread/nav_types.h>
+//#include <dvdread/nav_types.h>
+#include "nav_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/extras/libdvdread/nav_read.h b/extras/libdvdread/nav_read.h
index 3f9ca6a3183858c36cc4de8abf764c821864b684..d62d362d47fe404f0723f90f8dff18a344bc1daf 100644 (file)
--- a/extras/libdvdread/nav_read.h
+++ b/extras/libdvdread/nav_read.h
@@ -19,7 +19,8 @@
 #ifndef NAV_READ_H_INCLUDED
 #define NAV_READ_H_INCLUDED
 
-#include <dvdread/nav_types.h>
+//#include <dvdread/nav_types.h>
+#include "nav_types.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/extras/libdvdread/nav_types.h b/extras/libdvdread/nav_types.h
index 14e7518579e2673ff88cb5424242ba3ebcc2b3a2..1c90fdc22e41cb335691b795599749ba6a686199 100644 (file)
--- a/extras/libdvdread/nav_types.h
+++ b/extras/libdvdread/nav_types.h
@@ -30,8 +30,8 @@
 #define NAV_TYPES_H_INCLUDED
 
 #include <inttypes.h>
-#include <dvdread/ifo_types.h> // only dvd_time_t, vm_cmd_t and user_ops_t
-
+//#include <dvdread/ifo_types.h> // only dvd_time_t, vm_cmd_t and user_ops_t
+#include "ifo_types.h"
 
 #undef ATTRIBUTE_PACKED
 #undef PRAGMA_PACK_BEGIN 

diff --git a/plugins/macosx/vout_macosx.c b/plugins/macosx/vout_macosx.c
index 97a86533442c648405101d0e30925f68b3b255e3..eecd8187b034ae7c4c8b5b446acc87854ad957b1 100644 (file)
--- a/plugins/macosx/vout_macosx.c
+++ b/plugins/macosx/vout_macosx.c
@@ -364,6 +364,9 @@ static int create_QTSequenceBestCodec( vout_thread_t *p_vout )
 
 static void dispose_QTSequence( vout_thread_t *p_vout )
 {
+    if (p_vout->p_sys->c_codec == 'NONE')
+       return ;
+       
     CDSequenceEnd( p_vout->p_sys->i_seq ) ;
     switch (p_vout->p_sys->c_codec)
     {
@@ -371,8 +374,8 @@ static void dispose_QTSequence( vout_thread_t *p_vout )
             free( (void *)p_vout->p_sys->p_yuv2 ) ;
             p_vout->p_sys->i_yuv2_size = 0 ;
             break ;
-        case 'y420': 
-            break ;
+        default:
+           break ;            
     }
     p_vout->p_sys->c_codec = 'NONE' ;
 }