Commit a3d6b5ca authored by Florian G. Pflug's avatar Florian G. Pflug
Browse files

*) 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.
parent 3a824f81
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#ifndef BSWAP_H_INCLUDED #ifndef BSWAP_H_INCLUDED
#define BSWAP_H_INCLUDED #define BSWAP_H_INCLUDED
#include <defs.h>
#include <config.h> #include <config.h>
#if defined(WORDS_BIGENDIAN) #if defined(WORDS_BIGENDIAN)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* (hard-linked) and adds a readv call function to tha API. * (hard-linked) and adds a readv call function to tha API.
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 Billy Biggs <vektor@dumbterm.net>. * 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> * Author: Billy Biggs <vektor@dumbterm.net>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -33,13 +33,18 @@ ...@@ -33,13 +33,18 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <limits.h>
#include <dlfcn.h>
#include <dirent.h> #include <dirent.h>
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)
#define SYS_BSD 1 #define SYS_BSD 1
#endif #endif
#ifdef SYS_DARWIN
#define off64_t off_t
#define stat64 stat
#define lseek64 lseek
#endif
#if defined(__sun) #if defined(__sun)
#include <sys/mnttab.h> #include <sys/mnttab.h>
#elif defined(SYS_BSD) #elif defined(SYS_BSD)
......
...@@ -20,8 +20,10 @@ ...@@ -20,8 +20,10 @@
#ifndef IFO_PRINT_H_INCLUDED #ifndef IFO_PRINT_H_INCLUDED
#define IFO_PRINT_H_INCLUDED #define IFO_PRINT_H_INCLUDED
#include <dvdread/ifo_types.h> //#include <dvdread/ifo_types.h>
#include <dvdread/dvd_reader.h> //#include <dvdread/dvd_reader.h>
#include "ifo_types.h"
#include "dvd_reader.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -20,8 +20,10 @@ ...@@ -20,8 +20,10 @@
#ifndef IFO_READ_H_INCLUDED #ifndef IFO_READ_H_INCLUDED
#define IFO_READ_H_INCLUDED #define IFO_READ_H_INCLUDED
#include <dvdread/ifo_types.h> //#include <dvdread/ifo_types.h>
#include <dvdread/dvd_reader.h> //#include <dvdread/dvd_reader.h>
#include "ifo_types.h"
#include "dvd_reader.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#define IFO_TYPES_H_INCLUDED #define IFO_TYPES_H_INCLUDED
#include <inttypes.h> #include <inttypes.h>
#include <dvdread/dvd_reader.h> //#include <dvdread/dvd_reader.h>
#include "dvd_reader.h"
#undef ATTRIBUTE_PACKED #undef ATTRIBUTE_PACKED
......
...@@ -21,7 +21,8 @@ ...@@ -21,7 +21,8 @@
#define NAV_PRINT_H_INCLUDED #define NAV_PRINT_H_INCLUDED
#include <stdio.h> #include <stdio.h>
#include <dvdread/nav_types.h> //#include <dvdread/nav_types.h>
#include "nav_types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
#ifndef NAV_READ_H_INCLUDED #ifndef NAV_READ_H_INCLUDED
#define 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 #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
#define NAV_TYPES_H_INCLUDED #define NAV_TYPES_H_INCLUDED
#include <inttypes.h> #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 ATTRIBUTE_PACKED
#undef PRAGMA_PACK_BEGIN #undef PRAGMA_PACK_BEGIN
......
...@@ -364,6 +364,9 @@ static int create_QTSequenceBestCodec( vout_thread_t *p_vout ) ...@@ -364,6 +364,9 @@ static int create_QTSequenceBestCodec( vout_thread_t *p_vout )
static void dispose_QTSequence( 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 ) ; CDSequenceEnd( p_vout->p_sys->i_seq ) ;
switch (p_vout->p_sys->c_codec) switch (p_vout->p_sys->c_codec)
{ {
...@@ -371,8 +374,8 @@ static void dispose_QTSequence( vout_thread_t *p_vout ) ...@@ -371,8 +374,8 @@ static void dispose_QTSequence( vout_thread_t *p_vout )
free( (void *)p_vout->p_sys->p_yuv2 ) ; free( (void *)p_vout->p_sys->p_yuv2 ) ;
p_vout->p_sys->i_yuv2_size = 0 ; p_vout->p_sys->i_yuv2_size = 0 ;
break ; break ;
case 'y420': default:
break ; break ;
} }
p_vout->p_sys->c_codec = 'NONE' ; p_vout->p_sys->c_codec = 'NONE' ;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment