Simplify rendition selection by removing redundant conditionals

@@ -632,7 +632,6 @@ videojs.HlsHandler.prototype.selectPlaylist = function () {
     now = +new Date(),
     now = +new Date(),
     i,
     i,
     variant,
     variant,
-    oldvariant,
     bandwidthBestVariant,
     bandwidthBestVariant,
     resolutionPlusOne,
     resolutionPlusOne,
     resolutionBestVariant,
     resolutionBestVariant,
@@ -689,7 +688,6 @@ videojs.HlsHandler.prototype.selectPlaylist = function () {
   // iterate through the bandwidth-filtered playlists and find
   // iterate through the bandwidth-filtered playlists and find
   // best rendition by player dimension
   // best rendition by player dimension
   while (i--) {
   while (i--) {
-    oldvariant = variant;
     variant = bandwidthPlaylists[i];
     variant = bandwidthPlaylists[i];
 
 
     // ignore playlists without resolution information
     // ignore playlists without resolution information
@@ -700,9 +698,9 @@ videojs.HlsHandler.prototype.selectPlaylist = function () {
       continue;
       continue;
     }
     }
 
 
-
     // since the playlists are sorted, the first variant that has
     // since the playlists are sorted, the first variant that has
     // dimensions less than or equal to the player size is the best
     // dimensions less than or equal to the player size is the best
+
     if (variant.attributes.RESOLUTION.width === width &&
     if (variant.attributes.RESOLUTION.width === width &&
         variant.attributes.RESOLUTION.height === height) {
         variant.attributes.RESOLUTION.height === height) {
       // if we have the exact resolution as the player use it
       // if we have the exact resolution as the player use it
@@ -711,14 +709,14 @@ videojs.HlsHandler.prototype.selectPlaylist = function () {
       break;
       break;
     } else if (variant.attributes.RESOLUTION.width < width &&
     } else if (variant.attributes.RESOLUTION.width < width &&
         variant.attributes.RESOLUTION.height < height) {
         variant.attributes.RESOLUTION.height < height) {
-      // if we don't have an exact match, see if we have a good higher quality variant to use
-      if (oldvariant && oldvariant.attributes && oldvariant.attributes.RESOLUTION &&
-          oldvariant.attributes.RESOLUTION.width && oldvariant.attributes.RESOLUTION.height) {
-        resolutionPlusOne = oldvariant;
-      }
-      resolutionBestVariant = variant;
+      // if both dimensions are less than the player use the
+      // previous (next-largest) variant
       break;
       break;
     }
     }
+
+    // we still haven't found a good match so keep a reference
+    // to the previous variant for the next loop iteration
+    resolutionPlusOne = variant;
   }
   }
 
 
   // fallback chain of variants
   // fallback chain of variants