From d5425bb64acdff5e67913232ac0f1c27748f1e6a Mon Sep 17 00:00:00 2001
From: Bart van den Ende <bart@twcapps.com>
Date: Fri, 15 Jan 2016 15:03:46 +0100
Subject: [PATCH] resolve #1095 store the language as normalised attribute so
 we can access it from the track parser

---
 .../smoothstreaming/SmoothStreamingManifestParser.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
index d48a5a7110..cc4a6996d5 100644
--- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
+++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
@@ -543,6 +543,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
       displayWidth = parseInt(parser, KEY_DISPLAY_WIDTH, -1);
       displayHeight = parseInt(parser, KEY_DISPLAY_HEIGHT, -1);
       language = parser.getAttributeValue(null, KEY_LANGUAGE);
+      putNormalizedAttribute(KEY_LANGUAGE, language);
       timescale = parseInt(parser, KEY_TIME_SCALE, -1);
       if (timescale == -1) {
         timescale = (Long) getNormalizedAttribute(KEY_TIME_SCALE);
@@ -634,12 +635,12 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
         // If fourCC is missing and the stream type is audio, we assume AAC.
         mimeType = fourCC != null ? fourCCToMimeType(fourCC)
             : type == StreamElement.TYPE_AUDIO ? MimeTypes.AUDIO_AAC : null;
-        language = (String) getNormalizedAttribute(KEY_LANGUAGE);
       }
 
       if (type == StreamElement.TYPE_AUDIO) {
         samplingRate = parseRequiredInt(parser, KEY_SAMPLING_RATE);
         channels = parseRequiredInt(parser, KEY_CHANNELS);
+        language = (String) getNormalizedAttribute(KEY_LANGUAGE);
       } else {
         samplingRate = -1;
         channels = -1;