From: Sergey M․ Date: Fri, 11 Dec 2015 14:28:44 +0000 (+0600) Subject: [downloader/f4m] Decode manifest before fixing X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=4db43567e8833ca0eb89d694260e5640c414ca07;p=youtube-dl [downloader/f4m] Decode manifest before fixing --- diff --git a/youtube_dl/downloader/f4m.py b/youtube_dl/downloader/f4m.py index 7819a91dc..aaf0c49c8 100644 --- a/youtube_dl/downloader/f4m.py +++ b/youtube_dl/downloader/f4m.py @@ -292,7 +292,7 @@ class F4mFD(FragmentFD): # Some manifests may be malformed, e.g. prosiebensat1 generated manifests # (see https://github.com/rg3/youtube-dl/issues/6215#issuecomment-121704244 # and https://github.com/rg3/youtube-dl/issues/7823) - manifest = fix_xml_ampersands(urlh.read()).strip() + manifest = fix_xml_ampersands(urlh.read().decode('utf-8', 'ignore')).strip() doc = compat_etree_fromstring(manifest) formats = [(int(f.attrib.get('bitrate', -1)), f)