diff -uNr libdv-0.104/encodedv/dvconnect.c libdv-0.104-new/encodedv/dvconnect.c --- libdv-0.104/encodedv/dvconnect.c 2004-05-30 22:05:23.000000000 -0400 +++ libdv-0.104-new/encodedv/dvconnect.c 2005-04-28 10:43:43.000000000 -0400 @@ -857,12 +857,13 @@ int rt_raisepri (int pri) { -#ifdef _SC_PRIORITY_SCHEDULING +#if defined(_SC_PRIORITY_SCHEDULING) && !defined(__APPLE__) struct sched_param scp; /* * Verify that scheduling is available */ +#if defined(_SC_PRIORITY_SCHEDULING) && !defined(__APPLE__) if (sysconf (_SC_PRIORITY_SCHEDULING) == -1) { fprintf (stderr, "WARNING: RR-scheduler not available, " "disabling.\n"); @@ -877,6 +878,11 @@ } #endif return (0); +#else + fprintf (stderr, "WARNING: RR-scheduler not available, " + "disabling.\n"); + return (-1); +#endif } /* ------------------------------------------------------------------------ diff -uNr libdv-0.104/libdv/vlc.h libdv-0.104-new/libdv/vlc.h --- libdv-0.104/libdv/vlc.h 2003-10-20 15:46:50.000000000 -0400 +++ libdv-0.104-new/libdv/vlc.h 2005-04-28 10:43:43.000000000 -0400 @@ -69,7 +69,7 @@ extern void dv_decode_vlc(int bits,int maxbits, dv_vlc_t *result); extern void __dv_decode_vlc(int bits, dv_vlc_t *result); -extern __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) { +static __inline__ void dv_peek_vlc(bitstream_t *bs,int maxbits, dv_vlc_t *result) { if(maxbits < 16) dv_decode_vlc(bitstream_show(bs,16),maxbits,result); else diff -uNr libdv-0.104/playdv/Makefile.in libdv-0.104-new/playdv/Makefile.in --- libdv-0.104/playdv/Makefile.in 2004-11-29 22:23:43.000000000 -0500 +++ libdv-0.104-new/playdv/Makefile.in 2005-04-28 10:43:43.000000000 -0400 @@ -209,7 +209,7 @@ AM_CFLAGS = $(SDL_CFLAGS) $(GTK_CFLAGS) noinst_HEADERS = display.h oss.h playdv_SOURCES = playdv.c display.c display.h oss.c -playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) +playdv_LDADD = $(SDL_LIBS) $(GTK_LIBS) $(XV_LIB) ../libdv/libdv.la $(POPT_LIB) -loss all: all-am .SUFFIXES: diff -uNr libdv-0.104/playdv/oss.c libdv-0.104-new/playdv/oss.c --- libdv-0.104/playdv/oss.c 2003-11-23 17:59:08.000000000 -0500 +++ libdv-0.104-new/playdv/oss.c 2005-04-28 10:43:43.000000000 -0400 @@ -34,7 +34,11 @@ #include #include #include +#if defined(__APPLE__) && (__GNUC__) +#include +#else #include +#endif /* Darwin liboss */ #include "oss.h"