[libbluray-devel] Allow selecting aacs/ bdplus libraries with LIBAACS_PATH and LIBBDPLUS_PATH environment variables

[npzacs]

libbluray | branch: master | npzacs <npzacs at gmail.com> | Fri Nov  8 11:01:29 2013 +0200| [ecbdd7e603bd2623fda9d9e72056516fc3c4c61a] | committer: npzacs

Allow selecting aacs/bdplus libraries with LIBAACS_PATH and LIBBDPLUS_PATH environment variables

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=ecbdd7e603bd2623fda9d9e72056516fc3c4c61a
---

 src/file/libaacs.c   |    7 ++++++-
 src/file/libbdplus.c |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/file/libaacs.c b/src/file/libaacs.c
index 1bb9902..9fddf2f 100644
--- a/src/file/libaacs.c
+++ b/src/file/libaacs.c
@@ -90,7 +90,12 @@ BD_AACS *libaacs_load(void)
 {
     BD_AACS *p = calloc(1, sizeof(BD_AACS));
 
-    p->h_libaacs = dl_dlopen("libaacs", "0");
+    const char *libaacs = getenv("LIBAACS_PATH");
+    if (!libaacs) {
+        libaacs = "libaacs";
+    }
+
+    p->h_libaacs = dl_dlopen(libaacs, "0");
     if (!p->h_libaacs) {
         BD_DEBUG(DBG_BLURAY | DBG_CRIT, "libaacs not found!\n");
         X_FREE(p);
diff --git a/src/file/libbdplus.c b/src/file/libbdplus.c
index 79c332d..297d182 100644
--- a/src/file/libbdplus.c
+++ b/src/file/libbdplus.c
@@ -92,7 +92,12 @@ BD_BDPLUS *libbdplus_load(void)
 
     BD_DEBUG(DBG_BDPLUS, "attempting to load libbdplus\n");
 
-    p->h_libbdplus = dl_dlopen("libbdplus", "0");
+    const char *libbdplus = getenv("LIBBDPLUS_PATH");
+    if (!libbdplus) {
+        libbdplus = "libbdplus";
+    }
+
+    p->h_libbdplus = dl_dlopen(libbdplus, "0");
     if (!p->h_libbdplus) {
         BD_DEBUG(DBG_BLURAY | DBG_CRIT, "libbdplus not found!\n");
         X_FREE(p);