normalize newlines in encoding errors

2014-01-24 11:46:06 +00:00 · 2014-01-24 11:46:06 +00:00 · b7c4d9af41
commit b7c4d9af41
parent d0c9848e89
1 changed files with 1 additions and 0 deletions
--- a/pandora/archive/extract.py
+++ b/pandora/archive/extract.py
@ -254,6 +254,7 @@ def stream(video, target, profile, info, avconv=None):
        t = "%s.mp4" % target if format == 'mp4' else target
        if os.path.exists(t):
            os.unlink(t)
+        stdout = stdout.replace('\r\n', '\n').replace('\r', '\n')
        return False, stdout
    if format == 'mp4':
        cmd = ['qt-faststart', "%s.mp4" % target, target]