[libbluray-devel] Default to stream 0 when requested language not found

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Sat Jun 23 14:01:09 2012 +0300| [d5ed7880ff4d952aaeb9e9b2e253fecc16d68d49] | committer: hpi1

Default to stream 0 when requested language not found

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

 ChangeLog              |    1 +
 src/libbluray/bluray.c |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 378e7aa..0080f3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+ - Default to stream 0 when requested language not found
  - Install bd_info
  - Added extended AACS error codes
 
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index 141a9b9..2e6ab69 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -258,7 +258,7 @@ static int _queue_event(BLURAY *bd, BD_EVENT ev)
 
 static void _update_stream_psr_by_lang(BD_REGISTERS *regs,
                                        uint32_t psr_lang, uint32_t psr_stream,
-                                       uint32_t enable_flag, uint32_t undefined_val,
+                                       uint32_t enable_flag,
                                        MPLS_STREAM *streams, unsigned num_streams)
 {
     uint32_t psr_val;
@@ -283,7 +283,7 @@ static void _update_stream_psr_by_lang(BD_REGISTERS *regs,
 
     if (stream_idx < 0) {
         /* requested language not found */
-        stream_idx = undefined_val - 1;
+        stream_idx = 0;
         enable_flag = 0;
     }
 
@@ -312,10 +312,10 @@ static void _update_clip_psrs(BLURAY *bd, NAV_CLIP *clip)
         MPLS_STN *stn = &clip->title->pl->play_item[clip->ref].stn;
 
         _update_stream_psr_by_lang(bd->regs,
-                                   PSR_AUDIO_LANG, PSR_PRIMARY_AUDIO_ID, 0, 0xff,
+                                   PSR_AUDIO_LANG, PSR_PRIMARY_AUDIO_ID, 0,
                                    stn->audio, stn->num_audio);
         _update_stream_psr_by_lang(bd->regs,
-                                   PSR_PG_AND_SUB_LANG, PSR_PG_STREAM, 0x80000000, 0xfff,
+                                   PSR_PG_AND_SUB_LANG, PSR_PG_STREAM, 0x80000000,
                                    stn->pg, stn->num_pg);
     }
 }