[libbluray-devel] Allow stream auto selection code to disable already enabled subtitle track

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Thu Jun 20 14:10:52 2013 +0300| [e940bef514004f4b0a3ccd62e75fa026c0fd2de0] | committer: hpi1

Allow stream auto selection code to disable already enabled subtitle track

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

 ChangeLog              |    1 +
 src/libbluray/bluray.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bc09fb7..27ea7be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 - Fixed logging with non-default mask
 - Added missing Java files to distribution package
 - Improved BD-J support (still alpha)
+- Improved language-based stream autoselection
 - Added initial support for BluRay Text Subtitles
 
 2013-04-30: Version 0.3.0
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index 163f97f..0385773 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -336,7 +336,7 @@ static void _update_stream_psr_by_lang(BD_REGISTERS *regs,
 
     bd_psr_lock(regs);
 
-    psr_val = bd_psr_read(regs, psr_stream) & 0xffff0000;
+    psr_val = bd_psr_read(regs, psr_stream) & 0x7fff0000;
     psr_val |= (stream_idx + 1) | enable_flag;
     bd_psr_write(regs, psr_stream, psr_val);