Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Api/Playback/Hls/VideoHlsService.cs

@@ -160,7 +160,7 @@ namespace MediaBrowser.Api.Playback.Hls
 
             if (!string.IsNullOrEmpty(state.VideoRequest.Level))
             {
-                args += " -level 3" + state.VideoRequest.Level;
+                args += " -level " + state.VideoRequest.Level;
             }
             
             if (state.SubtitleStream != null)

MediaBrowser.Api/Playback/Progressive/VideoService.cs

@@ -153,7 +153,7 @@ namespace MediaBrowser.Api.Playback.Progressive
 
             if (!string.IsNullOrEmpty(state.VideoRequest.Level))
             {
-                args += " -level 3" + state.VideoRequest.Level;
+                args += " -level " + state.VideoRequest.Level;
             }
 
             if (state.SubtitleStream != null)

MediaBrowser.Controller/Entities/Folder.cs

@@ -774,7 +774,16 @@ namespace MediaBrowser.Controller.Entities
                         progress.Report((90 * percent) + 10);
                     });
 
-                    await ((Folder)child).ValidateChildren(innerProgress, cancellationToken, recursive: recursive).ConfigureAwait(false);
+                    await ((Folder) child).ValidateChildren(innerProgress, cancellationToken, recursive).ConfigureAwait(false);
+                }
+                else
+                {
+                    percentages.TryUpdate(child.Id, 1, percentages[child.Id]);
+
+                    var percent = percentages.Values.Sum();
+                    percent /= list.Count;
+
+                    progress.Report((90 * percent) + 10);
                 }
             }));