summaryrefslogtreecommitdiffstats
path: root/cfg-common.h
diff options
context:
space:
mode:
authorlgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-04 13:08:14 +0000
committerlgb <lgb@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-04 13:08:14 +0000
commit997c6f8f7b3dd50444a623d041bf745cbde83268 (patch)
tree5fdc44d120b0f43b6fd6adf4f50464a5a363a8c3 /cfg-common.h
parentc62a555b0cb0dcb540f80c9dae74ff5065cdc1f7 (diff)
downloadmpv-997c6f8f7b3dd50444a623d041bf745cbde83268.tar.bz2
mpv-997c6f8f7b3dd50444a623d041bf745cbde83268.tar.xz
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 :) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3976 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-common.h')
-rw-r--r--cfg-common.h18
1 files changed, 4 insertions, 14 deletions
diff --git a/cfg-common.h b/cfg-common.h
index 14c6f8d5bd..c1513ff20f 100644
--- a/cfg-common.h
+++ b/cfg-common.h
@@ -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 --------------------