]> granicus.if.org Git - handbrake/commitdiff
decsrt: don't add extra hard line break at end of subtitle
authorJohn Stebbins <jstebbins.hb@gmail.com>
Thu, 9 Jun 2016 21:59:00 +0000 (15:59 -0600)
committerJohn Stebbins <jstebbins.hb@gmail.com>
Thu, 9 Jun 2016 21:59:00 +0000 (15:59 -0600)
libhb/decsrtsub.c

index e4366f96b42bfaf7549aebc8376fa87e4ab20d30..8b2fa8585784c83b1e1468bfd1da603d61834af0 100644 (file)
@@ -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