[MPlayer-cvslog] r35357 - in trunk: Makefile libdvdcss/css.c libdvdcss/dvdcss/dvdcss.h

[SubJunk]

Author: SubJunk
Date: Tue Nov  6 06:47:13 2012
New Revision: 35357

Log:
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

Modified:
   trunk/Makefile
   trunk/libdvdcss/css.c
   trunk/libdvdcss/dvdcss/dvdcss.h

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Nov  6 06:41:14 2012	(r35356)
+++ trunk/Makefile	Tue Nov  6 06:47:13 2012	(r35357)
@@ -846,7 +846,7 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma
 
 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)
 

Modified: trunk/libdvdcss/css.c
==============================================================================
--- trunk/libdvdcss/css.c	Tue Nov  6 06:41:14 2012	(r35356)
+++ trunk/libdvdcss/css.c	Tue Nov  6 06:47:13 2012	(r35357)
@@ -130,8 +130,8 @@ void _dvdcss_test( dvdcss_t dvdcss )
 
     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 @@ static int CrackDiscKey( dvdcss_t dvdcss
     memset( BigTable, 0 , 16777216 * sizeof(int) );
     if( BigTable == NULL )
     {
+        free( K1table );
         return -1;
     }
 

Modified: trunk/libdvdcss/dvdcss/dvdcss.h
==============================================================================
--- trunk/libdvdcss/dvdcss/dvdcss.h	Tue Nov  6 06:41:14 2012	(r35356)
+++ trunk/libdvdcss/dvdcss/dvdcss.h	Tue Nov  6 06:47:13 2012	(r35357)
@@ -60,6 +60,8 @@ typedef struct dvdcss_s* dvdcss_t;
 #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