Merge branch 'master' into buffer

1 files changed, 8 insertions, 2 deletions

diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index 293cf5ea5b..0e2d70017c 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -23,6 +23,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 string line;
                 while (reader.ReadLine() != "[Events]")
                 { }
+
                 var headers = ParseFieldHeaders(reader.ReadLine());
 
                 while ((line = reader.ReadLine()) != null)
@@ -33,10 +34,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     {
                         continue;
                     }
+
                     if (line.StartsWith("["))
+                    {
                         break;
-                    if (string.IsNullOrEmpty(line))
-                        continue;
+                    }
+
                     var subEvent = new SubtitleTrackEvent { Id = eventIndex.ToString(_usCulture) };
                     eventIndex++;
                     var sections = line.Substring(10).Split(',');
@@ -54,6 +57,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     trackEvents.Add(subEvent);
                 }
             }
+
             trackInfo.TrackEvents = trackEvents.ToArray();
             return trackInfo;
         }
@@ -110,11 +114,13 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 {
                     pre = s.Substring(0, 5) + "}";
                 }
+
                 int indexOfEnd = p.Text.IndexOf('}');
                 p.Text = p.Text.Remove(indexOfBegin, (indexOfEnd - indexOfBegin) + 1);
 
                 indexOfBegin = p.Text.IndexOf('{');
             }
+
             p.Text = pre + p.Text;
         }
     }