From: Sergey M․ <dstftw@gmail.com>
Date: Tue, 5 Mar 2019 16:45:40 +0000 (+0700)
Subject: [extractor/common] Do not fail on invalid data while parsing F4M manifest in non... 
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d9eb580a796ef6c9a248fdd8896ccf85349c35eb;p=youtube-dl

[extractor/common] Do not fail on invalid data while parsing F4M manifest in non fatal mode
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 641e50f3c..55ce1a888 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -13,6 +13,7 @@ import socket
 import sys
 import time
 import math
+import xml
 
 from ..compat import (
     compat_cookiejar,
@@ -1464,6 +1465,9 @@ class InfoExtractor(object):
     def _parse_f4m_formats(self, manifest, manifest_url, video_id, preference=None, f4m_id=None,
                            transform_source=lambda s: fix_xml_ampersands(s).strip(),
                            fatal=True, m3u8_id=None):
+        if not isinstance(manifest, xml.etree.ElementTree.Element) and not fatal:
+            return []
+
         # currently youtube-dl cannot decode the playerVerificationChallenge as Akamai uses Adobe Alchemy
         akamai_pv = manifest.find('{http://ns.adobe.com/f4m/1.0}pv-2.0')
         if akamai_pv is not None and ';' in akamai_pv.text: