[MPlayer-cvslog] Update libdvdcss to r255

Klaus Burton subjunk at gmail.com
Sat Nov 3 22:37:44 CET 2012


Here's another patch for review before I commit it, this one syncs
libdvdcss to r255.
Specifically, the changes are a memory leak fix (r239), assume a default
drive type (r249) and support ELF visibility attribute (r255).

Index: libdvdcss/css.c
===================================================================
--- libdvdcss/css.c	(revision 35248)
+++ libdvdcss/css.c	(working copy)
@@ -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;
     }
 
Index: libdvdcss/dvdcss/dvdcss.h
===================================================================
--- libdvdcss/dvdcss/dvdcss.h	(revision 35248)
+++ libdvdcss/dvdcss/dvdcss.h	(working copy)
@@ -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
Index: Makefile
===================================================================
--- Makefile	(revision 35248)
+++ Makefile	(working copy)
@@ -860,7 +860,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)
 



More information about the MPlayer-cvslog mailing list