April 2007 - DVDnav-discuss - lists.mplayerhq.hu

r887 - in trunk/libdvdnav: dvdnav-config src/dvdnav.c src/dvdnav.h src/dvdnav_events.h src/dvdnav_internal.h src/highlight.c src/navigation.c src/read_cache.c src/read_cache.h src/remap.c src/searching.c src/settings.c src/vm/decoder.c src/vm/decoder.h src/vm/vm.c src/vm/vm.h src/vm/vmcmd.c src/vm/vmcmd.h
by nicodvb 20 Apr '07

20 Apr '07

Author: nicodvb Date: Sat Apr 21 01:24:59 2007 New Revision: 887 Added: trunk/libdvdnav/dvdnav-config - copied unchanged from r870, /trunk/libdvdnav/misc/dvdnav-config.in Modified: trunk/libdvdnav/src/dvdnav.c trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/dvdnav_events.h trunk/libdvdnav/src/dvdnav_internal.h trunk/libdvdnav/src/highlight.c trunk/libdvdnav/src/navigation.c trunk/libdvdnav/src/read_cache.c trunk/libdvdnav/src/read_cache.h trunk/libdvdnav/src/remap.c trunk/libdvdnav/src/searching.c trunk/libdvdnav/src/settings.c trunk/libdvdnav/src/vm/decoder.c trunk/libdvdnav/src/vm/decoder.h trunk/libdvdnav/src/vm/vm.c trunk/libdvdnav/src/vm/vm.h trunk/libdvdnav/src/vm/vmcmd.c trunk/libdvdnav/src/vm/vmcmd.h Log: moved all header inclusions from .h to .c files; my word, I've never seen such a horrible entanglement as in this mess Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Sat Apr 21 01:24:59 2007 @@ -30,6 +30,15 @@ */ #include <inttypes.h> +#include "dvd_types.h" +#include "dvd_reader.h" +#include "nav_types.h" +#include "ifo_types.h" /* For vm_cmd_t */ +#include "remap.h" +#include "vm/decoder.h" +#include "vm/vm.h" +#include "dvdnav.h" +#include "dvdnav_events.h" #include "dvdnav_internal.h" #include "read_cache.h" #include "nav_read.h" Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Sat Apr 21 01:24:59 2007 @@ -35,16 +35,11 @@ extern "C" { #endif -#ifdef DVDNAV_COMPILE -# include "dvdnav_events.h" -# include "dvd_types.h" -# include "dvd_reader.h" -# include "ifo_types.h" /* For vm_cmd_t */ -#else -# include <dvdnav/dvdnav_events.h> +#ifndef DVDNAV_COMPILE # include <dvdnav/dvd_types.h> # include <dvdnav/dvd_reader.h> # include <dvdnav/ifo_types.h> /* For vm_cmd_t */ +# include <dvdnav/dvdnav_events.h> #endif Modified: trunk/libdvdnav/src/dvdnav_events.h ============================================================================== --- trunk/libdvdnav/src/dvdnav_events.h (original) +++ trunk/libdvdnav/src/dvdnav_events.h Sat Apr 21 01:24:59 2007 @@ -28,11 +28,6 @@ #ifndef DVDNAV_EVENTS_H_INCLUDED #define DVDNAV_EVENTS_H_INCLUDED -#include "ifo_types.h" -#include "dvd_reader.h" -#include "nav_types.h" - - /* * DVDNAV_BLOCK_OK * Modified: trunk/libdvdnav/src/dvdnav_internal.h ============================================================================== --- trunk/libdvdnav/src/dvdnav_internal.h (original) +++ trunk/libdvdnav/src/dvdnav_internal.h Sat Apr 21 01:24:59 2007 @@ -65,14 +65,6 @@ static inline int _private_gettimeofday( #endif /* WIN32 */ -/* Uncomment for VM command tracing */ -/* #define TRACE */ - -#include "decoder.h" -#include "dvdnav.h" -#include "vm.h" -#include "vmcmd.h" - /* where should libdvdnav write its messages (stdout/stderr) */ #define MSG_OUT stdout Modified: trunk/libdvdnav/src/highlight.c ============================================================================== --- trunk/libdvdnav/src/highlight.c (original) +++ trunk/libdvdnav/src/highlight.c Sat Apr 21 01:24:59 2007 @@ -28,7 +28,13 @@ #include <assert.h> #include <inttypes.h> #include "nav_types.h" +#include "dvd_types.h" +#include "remap.h" +#include "vm/decoder.h" +#include "vm/vm.h" +#include "vm/vmcmd.h" #include "dvdnav_internal.h" +#include "dvdnav.h" /* #define BUTTON_TESTING Modified: trunk/libdvdnav/src/navigation.c ============================================================================== --- trunk/libdvdnav/src/navigation.c (original) +++ trunk/libdvdnav/src/navigation.c Sat Apr 21 01:24:59 2007 @@ -26,6 +26,14 @@ #endif #include <inttypes.h> +#include "dvd_types.h" +#include "nav_types.h" +#include "ifo_types.h" +#include "remap.h" +#include "vm/decoder.h" +#include "vm/vm.h" +#include "vm/vmcmd.h" +#include "dvdnav.h" #include "dvdnav_internal.h" /* Navigation API calls */ Modified: trunk/libdvdnav/src/read_cache.c ============================================================================== --- trunk/libdvdnav/src/read_cache.c (original) +++ trunk/libdvdnav/src/read_cache.c Sat Apr 21 01:24:59 2007 @@ -32,6 +32,13 @@ #endif #include <inttypes.h> +#include "dvd_types.h" +#include "nav_types.h" +#include "ifo_types.h" +#include "remap.h" +#include "vm/decoder.h" +#include "vm/vm.h" +#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" #include "read_cache.h" Modified: trunk/libdvdnav/src/read_cache.h ============================================================================== --- trunk/libdvdnav/src/read_cache.h (original) +++ trunk/libdvdnav/src/read_cache.h Sat Apr 21 01:24:59 2007 @@ -24,8 +24,6 @@ #ifndef __DVDNAV_READ_CACHE_H #define __DVDNAV_READ_CACHE_H -#include "dvdnav_internal.h" - /* Opaque cache type -- defined in dvdnav_internal.h */ /* typedef struct read_cache_s read_cache_t; */ Modified: trunk/libdvdnav/src/remap.c ============================================================================== --- trunk/libdvdnav/src/remap.c (original) +++ trunk/libdvdnav/src/remap.c Sat Apr 21 01:24:59 2007 @@ -32,7 +32,14 @@ #endif /* _MSC_VER */ #include <assert.h> +#include "dvd_types.h" +#include "nav_types.h" +#include "ifo_types.h" #include "remap.h" +#include "vm/decoder.h" +#include "vm/vm.h" +#include "vm/vmcmd.h" +#include "dvdnav.h" #include "dvdnav_internal.h" struct block_s { Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Sat Apr 21 01:24:59 2007 @@ -27,6 +27,14 @@ #include <assert.h> #include <inttypes.h> +#include "dvd_types.h" +#include "nav_types.h" +#include "ifo_types.h" +#include "remap.h" +#include "vm/decoder.h" +#include "vm/vm.h" +#include "vm/vmcmd.h" +#include "dvdnav.h" #include "dvdnav_internal.h" /* Modified: trunk/libdvdnav/src/settings.c ============================================================================== --- trunk/libdvdnav/src/settings.c (original) +++ trunk/libdvdnav/src/settings.c Sat Apr 21 01:24:59 2007 @@ -25,6 +25,14 @@ #include "config.h" #endif +#include "dvd_types.h" +#include "nav_types.h" +#include "ifo_types.h" +#include "remap.h" +#include "vm/decoder.h" +#include "vm/vm.h" +#include "vm/vmcmd.h" +#include "dvdnav.h" #include "dvdnav_internal.h" /* Characteristics/setting API calls */ Modified: trunk/libdvdnav/src/vm/decoder.c ============================================================================== --- trunk/libdvdnav/src/vm/decoder.c (original) +++ trunk/libdvdnav/src/vm/decoder.c Sat Apr 21 01:24:59 2007 @@ -31,8 +31,15 @@ #include <stdlib.h> #include <inttypes.h> #include <string.h> /* For memset */ +#include "nav_types.h" #include "ifo_types.h" /* vm_cmd_t */ +#include "dvd_types.h" +#include "remap.h" +#include "decoder.h" +#include "vm.h" +#include "vmcmd.h" +#include "dvdnav.h" #include "dvdnav_internal.h" uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) { Modified: trunk/libdvdnav/src/vm/decoder.h ============================================================================== --- trunk/libdvdnav/src/vm/decoder.h (original) +++ trunk/libdvdnav/src/vm/decoder.h Sat Apr 21 01:24:59 2007 @@ -28,9 +28,6 @@ #include <inttypes.h> #include <sys/time.h> -#include "ifo_types.h" /* vm_cmd_t */ -#include "dvdnav_internal.h" - /* link command types */ typedef enum { LinkNoLink = 0, Modified: trunk/libdvdnav/src/vm/vm.c ============================================================================== --- trunk/libdvdnav/src/vm/vm.c (original) +++ trunk/libdvdnav/src/vm/vm.c Sat Apr 21 01:24:59 2007 @@ -38,9 +38,16 @@ #include <sys/stat.h> #include <fcntl.h> +#include "nav_types.h" #include "ifo_types.h" #include "ifo_read.h" +#include "dvd_types.h" +#include "decoder.h" +#include "remap.h" +#include "vm.h" +#include "vmcmd.h" +#include "dvdnav.h" #include "dvdnav_internal.h" #ifdef _MSC_VER Modified: trunk/libdvdnav/src/vm/vm.h ============================================================================== --- trunk/libdvdnav/src/vm/vm.h (original) +++ trunk/libdvdnav/src/vm/vm.h Sat Apr 21 01:24:59 2007 @@ -26,9 +26,6 @@ #ifndef VM_H_INCLUDED #define VM_H_INCLUDED -#include "remap.h" -#include "dvdnav_internal.h" - /* DOMAIN enum */ typedef enum { @@ -172,6 +169,8 @@ video_attr_t vm_get_video_attr(vm_t *vm) audio_attr_t vm_get_audio_attr(vm_t *vm, int streamN); subp_attr_t vm_get_subp_attr(vm_t *vm, int streamN); +/* Uncomment for VM command tracing */ +/* #define TRACE */ #ifdef TRACE /* Debug */ void vm_position_print(vm_t *vm, vm_position_t *position); Modified: trunk/libdvdnav/src/vm/vmcmd.c ============================================================================== --- trunk/libdvdnav/src/vm/vmcmd.c (original) +++ trunk/libdvdnav/src/vm/vmcmd.c Sat Apr 21 01:24:59 2007 @@ -31,6 +31,14 @@ #include <ctype.h> #include <inttypes.h> +#include "dvd_types.h" +#include "nav_types.h" +#include "ifo_types.h" +#include "decoder.h" +#include "remap.h" +#include "vm.h" +#include "vmcmd.h" +#include "dvdnav.h" #include "dvdnav_internal.h" /* freebsd compatibility */ Modified: trunk/libdvdnav/src/vm/vmcmd.h ============================================================================== --- trunk/libdvdnav/src/vm/vmcmd.h (original) +++ trunk/libdvdnav/src/vm/vmcmd.h Sat Apr 21 01:24:59 2007 @@ -25,8 +25,6 @@ #ifndef VMCMD_H_INCLUDED #define VMCMD_H_INCLUDED -#include <inttypes.h> - void vm_print_mnemonic(vm_cmd_t *command); void vm_print_cmd(int row, vm_cmd_t *command);

1 0

Re: [DVDnav-discuss] re: removing autoshit stuff from dvdnav build system
by sci-fi＠hush.ai 20 Apr '07

20 Apr '07

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Fri, 20 Apr 2007 08:53:16 -0500 Nico Sabbi <nsabbi(a)email.it> wrote: > sci-fi(a)hush.ai wrote: > >> Right now ./configure2 doesn't work too well on my darwin setup here >> with all kinds of new/updated things over & above Apple's. >> > what's wrong? oh just the usual non-darwin'isms ;) [...] cd obj && gcc -shared -o libdvdnav.so dvdnav.so highlight.so navigation.so read_cache.so remap.so searching.so settings.so decoder.so vm.so vmcmd.so dvd_input.so dvd_reader.so dvd_udf.so ifo_print.so ifo_read.so md5.so nav_print.so nav_read.so powerpc-apple-darwin8-gcc-4.0.1: unrecognized option '-shared' /usr/bin/ld: Undefined symbols: _main collect2: ld returned 1 exit status make: *** [libdvdnav.so] Error 1 make: Leaving directory `/Volumes/IBMama/Projects/svn.mplayerhq.hu/dvdnav/libdvdnav' The Makefile coming from ./configure works just fine thru-out the build, including tacking on the .dylib suffix (fwiw I use libtool-1.5.23b which has quite a lot of badly needed darwin fixes, renamed to glibtool[ize] as what Fink does, so we don't step on Apple's non-gnu libtool -- note that I don't use Fink for anything but "clues" when I get stuck building things right out of the tarballs). Thanks... :) -----BEGIN PGP SIGNATURE----- Note: This signature can be verified at https://www.hushtools.com/verify Version: Hush 2.5 wkYEARECAAYFAkYo0b4ACgkQZbt5KOxKrtQWygCggHJ+jl8rf/906S+gmh1i7KkFz4kA ni4Ng5M7Jtbayee9J51xIUTryXyc =fs1c -----END PGP SIGNATURE----- -- Click for free info on graduate degrees and make $150K/ year http://tagline.hushmail.com/fc/CAaCXv1S5T9ICACXsoS4Rl0DiJeqlM8V/

2 1

re: removing autoshit stuff from dvdnav build system
by sci-fi＠hush.ai 20 Apr '07

20 Apr '07

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, I was patiently awaiting this list to join gmane, but it hasn't yet, so my participation is going to be, umm "weird" because of the known problems with Hushmail not replying correctly to threads (I've discussed this in mplayer lists many months ago if you need more history). We really really need gmane to carry this list, please. The main thing I want to bring up right now is to urge you-all to consider renaming the Makefile that you have in svn repo so it won't stomp on the standard ./configure process -- at least until you have all the kinks worked out of your new ./configure2, please. Perhaps rename your non-auto*-genned makefile to oh how about Makefile2, eh don't that kinda sound like a related filename? ;) Right now ./configure2 doesn't work too well on my darwin setup here with all kinds of new/updated things over & above Apple's. So I'm using ./configure, and of course I keep getting 'C'onflicts with them pesky >>>mine === <<<new markers poked in *my* generated Makefile when I svn up again. ;) Thanks.... :) -----BEGIN PGP SIGNATURE----- Note: This signature can be verified at https://www.hushtools.com/verify Version: Hush 2.5 wkYEARECAAYFAkYows0ACgkQZbt5KOxKrtR3EgCgpLEmgk81tihd04OA5N69gvFyswoA nRolasSVyXw5uVLRwUz4gOlTGP6W =PT5h -----END PGP SIGNATURE----- -- Click for top financial advice. Reduce debt & save for retirement http://tagline.hushmail.com/fc/CAaCXv1QQTpvzGsmsiPHhF0Rk4xn7nm9/

2 1

[PATCH] compiling with external dvdread, please test
by Nico Sabbi 20 Apr '07

20 Apr '07

./configure2 now accepts --with-dvdread=/usr/local/include/dvdread/ to compile dvdnav against an external dvdread. Please, test and report. p.s. there's still something weird with include paths that needs proper fixing. Nico

3 3

r886 - trunk/libdvdnav/Makefile
by nicodvb 19 Apr '07

19 Apr '07

Author: nicodvb Date: Fri Apr 20 00:36:28 2007 New Revision: 886 Modified: trunk/libdvdnav/Makefile Log: cosmesis Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Fri Apr 20 00:36:28 2007 @@ -9,26 +9,19 @@ LD=ld RANLIB=ranlib VPATH+= $(SRC_PATH_BARE)/src -SRCS = dvdnav.c highlight.c navigation.c read_cache.c remap.c \ - searching.c settings.c +SRCS = dvdnav.c highlight.c navigation.c read_cache.c remap.c searching.c settings.c VPATH+= $(SRC_PATH_BARE)/src/vm SRCS+= decoder.c vm.c vmcmd.c - - -HEADERS += src/dvd_types.h \ - src/dvdnav.h \ - src/dvdnav_events.h +HEADERS += src/dvd_types.h src/dvdnav.h src/dvdnav_events.h L=libdvdnav LIB = $(L).a SHLIB = $(L).so - CFLAGS += $(USEDEBUG) -Wall -funsigned-char CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm - CFLAGS += -DDVDNAV_COMPILE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H

1 0

r885 - in trunk/libdvdnav: Makefile configure2
by nicodvb 19 Apr '07

19 Apr '07

Author: nicodvb Date: Fri Apr 20 00:33:42 2007 New Revision: 885 Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/configure2 Log: permit building dvdnav against an external dvdread; needs more work but it's better committing soon and giving otheRs the chance to work on it Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Fri Apr 20 00:33:42 2007 @@ -15,21 +15,11 @@ SRCS = dvdnav.c highlight.c navigation.c VPATH+= $(SRC_PATH_BARE)/src/vm SRCS+= decoder.c vm.c vmcmd.c -VPATH+= $(SRC_PATH_BARE)/src/dvdread -SRCS+= dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \ - md5.c nav_print.c nav_read.c HEADERS += src/dvd_types.h \ src/dvdnav.h \ - src/dvdnav_events.h \ - src/dvdread/dvd_reader.h \ - src/dvdread/ifo_print.h \ - src/dvdread/ifo_read.h \ - src/dvdread/ifo_types.h \ - src/dvdread/nav_print.h \ - src/dvdread/nav_read.h \ - src/dvdread/nav_types.h + src/dvdnav_events.h L=libdvdnav LIB = $(L).a @@ -37,12 +27,27 @@ SHLIB = $(L).so CFLAGS += $(USEDEBUG) -Wall -funsigned-char -CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm \ - -I$(SRC_PATH)/src/dvdread +CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm CFLAGS += -DDVDNAV_COMPILE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H +ifeq ($(DVDREAD),internal) +VPATH+= $(SRC_PATH_BARE)/src/dvdread +HEADERS = src/dvdread/dvd_reader.h \ + src/dvdread/ifo_print.h \ + src/dvdread/ifo_read.h \ + src/dvdread/ifo_types.h \ + src/dvdread/nav_print.h \ + src/dvdread/nav_read.h \ + src/dvdread/nav_types.h +SRCS+= dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \ + md5.c nav_print.c nav_read.c +CFLAGS += -I$(SRC_PATH)/src/dvdread +else +CFLAGS += -I$(DVDREAD_DIR) +endif + SHLDFLAGS += -shared LIBS_INSTALL = $(CURDIR)/../lib Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Fri Apr 20 00:33:42 2007 @@ -34,6 +34,7 @@ show_help(){ echo " --disable-shared do not build shared libraries [default=yes]" echo " --enable-debug compile with debug symbols [default=yes]" echo " --disable-debug compile without debug symbols [default=no]" + echo " --with-dvdread=PATH compile libdvdnav with an external libdvdread" echo "Advanced options (experts only):" echo " --cc=CC use C compiler CC [$cc]" echo " --make=MAKE use specified make [$make]" @@ -47,6 +48,8 @@ show_help(){ SHARED=yes STATIC=yes +DVDREAD=internal +dvdread_dir=src/dvdread/ PREFIX=/usr/local/ INSTALLSTRIP=-s USEDEBUG=-g @@ -63,6 +66,8 @@ for opt do ;; --disable-static) STATIC=no ;; + --with-dvdread=*) DVDREAD="$optval" + ;; --prefix=*) PREFIX="$optval" ;; --libdir=*) libdir="$optval" @@ -98,6 +103,16 @@ test -z $libdir && libdir=$PREFIX/lib test -z $shlibdir && shlibdir=$PREFIX/lib test -z $incdir && incdir=$PREFIX/include/dvdnav +if [ "$DVDREAD" != "internal" ] ; then + if [ -d "$DVDREAD" -a -f "$DVDREAD/dvd_reader.h" ] ; then + dvdread_dir="$DVDREAD" + DVDREAD=external + else + DVDREAD=internal + fi +fi + + cat > config.mak << EOF # Automatically generated by configure, do not edit PREFIX=$PREFIX @@ -114,6 +129,8 @@ CFLAGS=$optimizations $cflags LDFLAGS=$ldflags INSTALLSTRIP=$INSTALLSTRIP USEDEBUG=$USEDEBUG +DVDREAD=$DVDREAD +DVDREAD_DIR=$dvdread_dir SRC_PATH="$source_path" SRC_PATH_BARE=$source_path

1 0

r881 - trunk/libdvdnav/src/dvdread/dvd_input.c
by nicodvb 19 Apr '07

19 Apr '07

Author: nicodvb Date: Thu Apr 19 00:34:52 2007 New Revision: 881 Modified: trunk/libdvdnav/src/dvdread/dvd_input.c Log: support for dvdcss in Darwin; patch by Diego Petteno' and Reimar Modified: trunk/libdvdnav/src/dvdread/dvd_input.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_input.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_input.c Thu Apr 19 00:34:52 2007 @@ -287,10 +287,15 @@ int dvdinput_setup(void) #else /* dlopening libdvdcss */ -#ifndef WIN32 - dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); +#ifdef __APPLE__ + #define CSS_LIB "libdvdcss.2.dylib" + dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); +#elif defined(WIN32) + #define CSS_LIB "libdvdcss.dll" + dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); #else - dvdcss_library = dlopen("libdvdcss.dll", RTLD_LAZY); + #define CSS_LIB "libdvdcss.so.2" + dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); #endif if(dvdcss_library != NULL) { @@ -323,8 +328,8 @@ int dvdinput_setup(void) dvdcss_library = NULL; } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek || !DVDcss_read || !DVDcss_error || !dvdcss_version) { - fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " - "this shouldn't happen !\n"); + fprintf(stderr, "libdvdread: Missing symbols in %s, " + "this shouldn't happen !\n", CSS_LIB); dlclose(dvdcss_library); } }

4 3

r884 - trunk/libdvdnav/src/dvdread/dvd_input.c
by reimar 19 Apr '07

19 Apr '07

Author: reimar Date: Thu Apr 19 17:45:30 2007 New Revision: 884 Modified: trunk/libdvdnav/src/dvdread/dvd_input.c Log: Move identical dlopen statements outside #ifdef mess Modified: trunk/libdvdnav/src/dvdread/dvd_input.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_input.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_input.c Thu Apr 19 17:45:30 2007 @@ -289,14 +289,12 @@ int dvdinput_setup(void) #ifdef __APPLE__ #define CSS_LIB "libdvdcss.2.dylib" - dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); #elif defined(WIN32) #define CSS_LIB "libdvdcss.dll" - dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); #else #define CSS_LIB "libdvdcss.so.2" - dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); #endif + dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY); if(dvdcss_library != NULL) { #if defined(__OpenBSD__) && !defined(__ELF__)

1 0

[PATCH] [dvdread] Avoid opendir() leak
by Diego 'Flameeyes' Pettenò 18 Apr '07

18 Apr '07

The attached patch, applied already to xine-lib's copy of libdvdnav and reported in dvd.sf.net's bug tracker, avoids leaking file descriptors from opendir() in the findDirFile function. Although I would have done it in a different way, this is the way libdvdread upstream already fixed the issue. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

2 1

[PATCH] Use snprintf() rather than strcpy+3×strncat
by Diego 'Flameeyes' Pettenò 18 Apr '07

18 Apr '07

The attached patch replaces a strncpy call and three strncat with a single snprintf() call. It's important because the boundary for strncat() is used in the wrong way (the way strlcat() should be used). The patch was added to xine-lib by Matthias Hopf <mat at mshopf.de>. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

3 2