From d535890b50cbe4d33e89e7fb066ffff3be328b33 Mon Sep 17 00:00:00 2001 From: nplourde Date: Mon, 18 Oct 2004 20:30:07 +0000 Subject: [PATCH] add vcd support to darwin for ppc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13679 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 6 +++--- libmpdemux/stream_vcd.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 5423c8ee9c..b6f3457824 100755 --- a/configure +++ b/configure @@ -4505,7 +4505,7 @@ echores "$_sgiaudio" echocheck "VCD support" -if linux || bsdos || freebsd || netbsd || sunos ; then +if linux || bsdos || freebsd || netbsd || sunos || (darwin && ppc) ; then _inputmodules="vcd $_inputmodules" _def_vcd='#define HAVE_VCD 1' echores "ok" @@ -6897,8 +6897,8 @@ $_def_vcd #define DEFAULT_CDROM_DEVICE "D:" #define DEFAULT_DVD_DEVICE "D:" #elif defined(SYS_DARWIN) -#define DEFAULT_CDROM_DEVICE "/dev/rdiskN" -#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE +#define DEFAULT_CDROM_DEVICE "/dev/disk1" +#define DEFAULT_DVD_DEVICE "/dev/rdiskN" #elif defined(__OpenBSD__) #define DEFAULT_CDROM_DEVICE "/dev/rcd0a" #define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE diff --git a/libmpdemux/stream_vcd.c b/libmpdemux/stream_vcd.c index 7076f394d7..58862bcd57 100644 --- a/libmpdemux/stream_vcd.c +++ b/libmpdemux/stream_vcd.c @@ -18,7 +18,9 @@ #include #include "vcd_read_fbsd.h" #elif defined(__NetBSD__) || defined (__OpenBSD__) -#include "vcd_read_nbsd.h" +#include "vcd_read_nbsd.h" +#elif defined(MACOSX) +#include "vcd_read_macosx.h" #else #include "vcd_read.h" #endif