X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Futils.py;h=95bd948438830ca7f98ad82decb722de69319bdf;hb=ea05129ebd807dc0a724f70a5bf71736e2f8f9bc;hp=e6ce028d620e0c68952ffe18813cfb1a885beef7;hpb=c7a725cfad52dd82ed4695eb526c053c7d48944d;p=youtube-dl

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index e6ce028d6..95bd94843 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -420,6 +420,14 @@ def encodeFilename(s):
             encoding = 'utf-8'
         return s.encode(encoding, 'ignore')
 
+def decodeOption(optval):
+    if optval is None:
+        return optval
+    if isinstance(optval, bytes):
+        optval = optval.decode(preferredencoding())
+
+    assert isinstance(optval, compat_str)
+    return optval
 
 class ExtractorError(Exception):
     """Error during info extraction."""