From: John Stebbins <jstebbins.hb@gmail.com>
Date: Thu, 9 Jun 2016 21:59:00 +0000 (-0600)
Subject: decsrt: don't add extra hard line break at end of subtitle
X-Git-Tag: 1.0.0~381
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=070bb1b3fca2011830fa1c08ab816d0859c83a97;p=handbrake

decsrt: don't add extra hard line break at end of subtitle
---

diff --git a/libhb/decsrtsub.c b/libhb/decsrtsub.c
index e4366f96b..8b2fa8585 100644
--- a/libhb/decsrtsub.c
+++ b/libhb/decsrtsub.c
@@ -180,18 +180,24 @@ void hb_srt_to_ssa(hb_buffer_t *sub_in, int line)
             ssa = (char*)sub_in->data;
             if (srt[ii] == '\r')
             {
-                ssa[pos++] = '\\';
-                ssa[pos++] = 'N';
-                ii++;
                 if (srt[ii] == '\n')
                 {
                     ii++;
                 }
+                if (srt[ii + 1] != 0)
+                {
+                    ssa[pos++] = '\\';
+                    ssa[pos++] = 'N';
+                }
+                ii++;
             }
             else if (srt[ii] == '\n')
             {
-                ssa[pos++] = '\\';
-                ssa[pos++] = 'N';
+                if (srt[ii + 1] != 0)
+                {
+                    ssa[pos++] = '\\';
+                    ssa[pos++] = 'N';
+                }
                 ii++;
             }
             else