code review comments

@@ -32,7 +32,7 @@ videojs.hls = {
 
 
 var
 var
 
 
-  pluginOptions,
+  settings,
 
 
   // the desired length of video to maintain in the buffer, in seconds
   // the desired length of video to maintain in the buffer, in seconds
   goalBufferLength = 5,
   goalBufferLength = 5,
@@ -129,7 +129,7 @@ var
     if (responseType) {
     if (responseType) {
       request.responseType = responseType;
       request.responseType = responseType;
     }
     }
-    if (pluginOptions.withCredentials) {
+    if (settings.withCredentials) {
       request.withCredentials = true;
       request.withCredentials = true;
     }
     }
 
 
@@ -318,7 +318,7 @@ var
       return;
       return;
     }
     }
 
 
-    pluginOptions = options || {};
+    settings = videojs.util.mergeOptions({}, options);
 
 
     srcUrl = (function() {
     srcUrl = (function() {
       var
       var
@@ -658,7 +658,8 @@ var
           // try moving on to the next segment
           // try moving on to the next segment
           player.hls.mediaIndex++;
           player.hls.mediaIndex++;
           return;
           return;
-        } else {
+        }
+
         // stop processing if the request was aborted
         // stop processing if the request was aborted
         if (!this.response) {
         if (!this.response) {
           return;
           return;
@@ -693,7 +694,6 @@ var
         // figure out what stream the next segment should be downloaded from
         // figure out what stream the next segment should be downloaded from
         // with the updated bandwidth information
         // with the updated bandwidth information
         updateCurrentPlaylist();
         updateCurrentPlaylist();
-        }
       });
       });
     };
     };