Mercurial > libdvdread4.hg
changeset 81:7e9feef7a82d src
Do not extract libdvdcss version via dvdcss_interface_2.
The variable is deprecated and only informs about the
libdvdcss API version, which carries no meaning nowadays.
author | diego |
---|---|
date | Thu, 21 Mar 2013 19:23:12 +0000 |
parents | d59aaee50e47 |
children | aa4a7b151801 |
files | dvd_input.c |
diffstat | 1 files changed, 1 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/dvd_input.c Thu Mar 21 19:16:39 2013 +0000 +++ b/dvd_input.c Thu Mar 21 19:23:12 2013 +0000 @@ -270,13 +270,10 @@ int dvdinput_setup(void) { void *dvdcss_library = NULL; - char **dvdcss_version = NULL; #ifdef HAVE_DVDCSS_DVDCSS_H /* linking to libdvdcss */ dvdcss_library = &dvdcss_library; /* Give it some value != NULL */ - /* the DVDcss_* functions have been #defined at the top */ - dvdcss_version = &dvdcss_interface_2; #else /* dlopening libdvdcss */ @@ -309,8 +306,6 @@ DVDcss_error = (char* (*)(dvdcss_t)) dlsym(dvdcss_library, U_S "dvdcss_error"); - dvdcss_version = (char **)dlsym(dvdcss_library, U_S "dvdcss_interface_2"); - if(dlsym(dvdcss_library, U_S "dvdcss_crack")) { fprintf(stderr, "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n" @@ -319,7 +314,7 @@ dlclose(dvdcss_library); dvdcss_library = NULL; } else if(!DVDcss_open || !DVDcss_close || !DVDcss_seek - || !DVDcss_read || !DVDcss_error || !dvdcss_version) { + || !DVDcss_read || !DVDcss_error) { fprintf(stderr, "libdvdread: Missing symbols in %s, " "this shouldn't happen !\n", CSS_LIB); dlclose(dvdcss_library); @@ -334,8 +329,6 @@ fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method); fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); */ - fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", - dvdcss_version ? *dvdcss_version : ""); /* libdvdcss wrapper functions */ dvdinput_open = css_open;