Merge remote-tracking branch 'upstream/master'

2014-04-09 16:58:14 -07:00 · 2014-04-09 16:58:14 -07:00 · ab0941be90
commit ab0941be90
parent a500f154d8 d5163c5ded
21 changed files with 127 additions and 101 deletions
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@ -649,7 +649,7 @@
            }

            // Just use the first audio stream
-            return audioStreams[0];
+            return audioStreams[0].Index;
        }

        function getVideoQualityOptions(mediaStreams) {