From f07b74fc18aac210c60ee8b8cb29b5b43b0eb780 Mon Sep 17 00:00:00 2001
From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 16 May 2014 15:47:54 +0200
Subject: [ffmpeg] Correct argument encoding on Windows with Python 2.x

Fixes #2924
---
 youtube_dl/utils.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'youtube_dl/utils.py')

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index aa9347f43..b97e62ae9 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -540,6 +540,16 @@ def encodeFilename(s, for_subprocess=False):
         encoding = 'utf-8'
     return s.encode(encoding, 'ignore')
 
+
+def encodeArgument(s):
+    if not isinstance(s, compat_str):
+        # Legacy code that uses byte strings
+        # Uncomment the following line after fixing all post processors
+        #assert False, 'Internal error: %r should be of type %r, is %r' % (s, compat_str, type(s))
+        s = s.decode('ascii')
+    return encodeFilename(s, True)
+
+
 def decodeOption(optval):
     if optval is None:
         return optval
-- 
cgit v1.2.3