From a3d6b5caa1845512f4e7bd14ac8407e65ea17826 Mon Sep 17 00:00:00 2001
From: "Florian G. Pflug" <fgp@videolan.org>
Date: Mon, 26 Nov 2001 22:28:05 +0000
Subject: [PATCH]  *) 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.
---
 extras/libdvdread/bswap.h     | 1 +
 extras/libdvdread/dvdread.c   | 9 +++++++--
 extras/libdvdread/ifo_print.h | 6 ++++--
 extras/libdvdread/ifo_read.h  | 6 ++++--
 extras/libdvdread/ifo_types.h | 3 ++-
 extras/libdvdread/nav_print.h | 3 ++-
 extras/libdvdread/nav_read.h  | 3 ++-
 extras/libdvdread/nav_types.h | 4 ++--
 plugins/macosx/vout_macosx.c  | 7 +++++--
 9 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/extras/libdvdread/bswap.h b/extras/libdvdread/bswap.h
index 23e2863b47..7842632cae 100644
--- 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 8c7ccceb5d..50b83c2ac8 100644
--- 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 97470a8945..3e69e8eeeb 100644
--- 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 b1c20e90bb..0c067c38e1 100644
--- 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 fe87fbb844..7d1e496209 100644
--- 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 53cc514614..ce194084cf 100644
--- 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 3f9ca6a318..d62d362d47 100644
--- 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 14e7518579..1c90fdc22e 100644
--- 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 97a8653344..eecd8187b0 100644
--- 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' ;
 }