libbluray | branch: master | Ricardo Constantino <wiia...@gmail.com> | Sun Aug 7 14:02:05 2016 +0100| [8f2441d820db6eb1ac4eaf24e2d46553a6a8dc1c] | committer: hpi1
Fix regression in builds without bdjava caused by cbb86e18 Signed-off-by: Ricardo Constantino (:RiCON) <wiia...@gmail.com> > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=8f2441d820db6eb1ac4eaf24e2d46553a6a8dc1c --- src/libbluray/bluray.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c index 50bad8f..10e4d76 100644 --- a/src/libbluray/bluray.c +++ b/src/libbluray/bluray.c @@ -1409,13 +1409,13 @@ BLURAY *bd_init(void) bd_mutex_init(&bd->mutex); #ifdef USING_BDJAVA bd_mutex_init(&bd->argb_buffer_mutex); -#endif env = getenv("LIBBLURAY_PERSISTENT_STORAGE"); if (env) { int v = (!strcmp(env, "yes")) ? 1 : (!strcmp(env, "no")) ? 0 : atoi(env); bd->bdjstorage.no_persistent_storage = !v; } +#endif BD_DEBUG(DBG_BLURAY, "BLURAY initialized!\n"); @@ -2779,6 +2779,7 @@ int bd_set_player_setting(BLURAY *bd, uint32_t idx, uint32_t value) bd_mutex_unlock(&bd->mutex); return result; } +#ifdef USING_BDJAVA if (idx == BLURAY_PLAYER_SETTING_PERSISTENT_STORAGE) { if (bd->title_type != title_undef) { BD_DEBUG(DBG_BLURAY | DBG_CRIT, "Can't disable persistent storage during playback\n"); @@ -2787,6 +2788,7 @@ int bd_set_player_setting(BLURAY *bd, uint32_t idx, uint32_t value) bd->bdjstorage.no_persistent_storage = !value; return 1; } +#endif for (i = 0; i < sizeof(map) / sizeof(map[0]); i++) { if (idx == map[i].idx) { _______________________________________________ libbluray-devel mailing list libbluray-devel@videolan.org https://mailman.videolan.org/listinfo/libbluray-devel
