Fixed demux_ts_get_optional_data(DEMUX_OPTIONAL_DATA_AUDIOLANG) :

  - Condition if(this->audio_tracks[channel].lang) is always true.
    Use if(this->audio_tracks[channel].lang[0]) instead.
  - Use stream index instead of current audio track when language is not known.
  - Return DEMUX_OPTIONAL_UNSUPPORTED for non-existing channels.

1 files changed, 4 insertions, 3 deletions

diff --git a/xine/BluRay/demux_ts.c b/xine/BluRay/demux_ts.c
index 7230eb02..4c79ee7f 100644
--- a/xine/BluRay/demux_ts.c
+++ b/xine/BluRay/demux_ts.c
@@ -2244,13 +2244,14 @@ static int demux_ts_get_optional_data(demux_plugin_t *this_gen,
     {
     case DEMUX_OPTIONAL_DATA_AUDIOLANG:
       if ((channel >= 0) && (channel < this->audio_tracks_count)) {
-        if(this->audio_tracks[channel].lang)
+        if(this->audio_tracks[channel].lang[0])
           strcpy(str, this->audio_tracks[channel].lang);
         else
-          sprintf(str, "%3i", _x_get_audio_channel(this->stream));
+          sprintf(str, "%3i", channel);
       }
       else {
-        snprintf(str, XINE_LANG_MAX, "%3i", _x_get_audio_channel(this->stream));
+        strcpy(str, "none");
+        return DEMUX_OPTIONAL_UNSUPPORTED;
       }
       return DEMUX_OPTIONAL_SUCCESS;