muxmp4: map '\r\n' and '\r' to '\n'.

Improves Apple compatibility and avoids double linebreaks in e.g. VLC.



git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5349 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 5 insertions, 0 deletions

diff --git a/libhb/muxmp4.c b/libhb/muxmp4.c
index a6444ea14..fcd2bce5b 100644
--- a/libhb/muxmp4.c
+++ b/libhb/muxmp4.c
@@ -869,6 +869,11 @@ static void hb_muxmp4_process_subtitle_style( uint8_t *input,
                 *writer++ = *reader++;
                 break;
             }
+        } else if (*reader == '\r') {
+            // skip '\r' and replace with '\n' if necessary
+            if (*(++reader) != '\n') {
+                *writer++ = '\n';
+            }
         } else {
             *writer++ = *reader++;
         }