Mercurial > mplayer.hg

diff cfg-common.h @ 3975:04b2227ab75a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Return of the 'Old-style-DVD-support', with dynamic loading (using libdl) so no more conflict with libdvdread: you can compile in both of libdvdread and libcss support! You can even select libcss.so to load from command line or configuration file, with '-csslib /usr/local/lib/libcss.so' or something similar. Default for this option is /usr/local/lib/libcss.so. Note: libcss version (ver>0.1) with newer API is not supported in this version! This is the first version so stay tuned :)
author lgb
date Fri, 04 Jan 2002 13:08:14 +0000
parents a14b3a600b81
children 9ff9f6ce6799
line wrap: on
line diff
--- a/cfg-common.h	Fri Jan 04 10:39:51 2002 +0000
+++ b/cfg-common.h	Fri Jan 04 13:08:14 2002 +0000
@@ -22,21 +22,11 @@
 #ifdef HAVE_LIBCSS
         {"dvdauth", &dvd_auth_device, CONF_TYPE_STRING, 0, 0, 0},
         {"dvdkey", &dvdimportkey, CONF_TYPE_STRING, 0, 0, 0},
-//	{"dvd", "Option -dvd will be \"full disk\" mode, old meaning has been renamed to -dvdauth.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
+	{"csslib", &css_so, CONF_TYPE_STRING, 0, 0, 0},
 #else
-//        {"dvd", "DVD support was not compiled in. See file DOCS/DVD.\n",
-//            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-#ifdef USE_DVDREAD
-        {"dvdkey", "MPlayer was compiled with libdvdread support, this option not available.\n",
-            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-        {"dvdauth", "MPlayer was compiled with libdvdread support! Use option -dvd !\n",
-            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-#else
-        {"dvdkey", "DVD support was not compiled in. See file DOCS/DVD.\n",
-            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-        {"dvdauth", "DVD support was not compiled in. See file DOCS/DVD.\n",
-            CONF_TYPE_PRINT, CONF_NOCFG, 0 , 0},
-#endif
+        {"dvdauth", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
+        {"dvdkey", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
+	{"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 #endif
 
 // ------------------------- demuxer options --------------------