Mercurial > mplayer.hg
changeset 35263:a893e72567ca
Updated libdvdcss to r255
Specifically, the changes are a memory leak fix (r239), assume a default drive type (r249) and support ELF visibility attribute (r255)
It has been pointed out in the mailing list that one or two of these changes may be unnecessary/redundant but harmless
This fixes #2096
| author | SubJunk |
|---|---|
| date | Tue, 06 Nov 2012 05:47:13 +0000 |
| parents | 49fc594fda43 |
| children | f6a7f07c7d5a |
| files | Makefile libdvdcss/css.c libdvdcss/dvdcss/dvdcss.h |
| diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Nov 06 05:41:14 2012 +0000 +++ b/Makefile Tue Nov 06 05:47:13 2012 +0000 @@ -846,7 +846,7 @@ gui/%: CFLAGS += -Wno-strict-prototypes -libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) +libdvdcss/%: CFLAGS := -Ilibdvdcss -D_GNU_SOURCE -DVERSION=\"1.2.11\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) libdvdnav/%: CFLAGS := -Ilibdvdnav -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) libdvdread4/%: CFLAGS := -Ilibdvdread4 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS)
--- a/libdvdcss/css.c Tue Nov 06 05:41:14 2012 +0000 +++ b/libdvdcss/css.c Tue Nov 06 05:47:13 2012 +0000 @@ -130,8 +130,8 @@ if( i_ret < 0 ) { - print_error( dvdcss, "css error: could not get RPC status, region-free drive?" ); - return; + print_error( dvdcss, "css error: could not get RPC status. Assuming RPC-I drive." ); + i_type = i_mask = i_rpc = 0; } switch( i_rpc ) @@ -1188,6 +1188,7 @@ memset( BigTable, 0 , 16777216 * sizeof(int) ); if( BigTable == NULL ) { + free( K1table ); return -1; }
--- a/libdvdcss/dvdcss/dvdcss.h Tue Nov 06 05:41:14 2012 +0000 +++ b/libdvdcss/dvdcss/dvdcss.h Tue Nov 06 05:47:13 2012 +0000 @@ -60,6 +60,8 @@ #define LIBDVDCSS_EXPORT __declspec(dllexport) extern #elif defined(LIBDVDCSS_IMPORTS) #define LIBDVDCSS_EXPORT __declspec(dllimport) extern +#elif defined(HAVE_VISIBILITY) +#define LIBDVDCSS_EXPORT __attribute__((visibility("default"))) extern #else #define LIBDVDCSS_EXPORT extern #endif