From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Mon, 4 Apr 2016 18:46:35 +0000 (+0200)
Subject: [utils] dfxp2srt: add additional namespace
X-Git-Tag: 2016.04.05~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5bf28d7864d83be98233b6d1e478d7911f99e2cb;p=youtube-dl.git

[utils] dfxp2srt: add additional namespace

Used by the ZDF subtitles (#9081).
---

diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 5c4ab2748c..8e53962c95 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -2131,6 +2131,7 @@ def dfxp2srt(dfxp_data):
     _x = functools.partial(xpath_with_ns, ns_map={
         'ttml': 'http://www.w3.org/ns/ttml',
         'ttaf1': 'http://www.w3.org/2006/10/ttaf1',
+        'ttaf1_0604': 'http://www.w3.org/2006/04/ttaf1',
     })
 
     class TTMLPElementParser(object):
@@ -2157,7 +2158,7 @@ def dfxp2srt(dfxp_data):
 
     dfxp = compat_etree_fromstring(dfxp_data.encode('utf-8'))
     out = []
-    paras = dfxp.findall(_x('.//ttml:p')) or dfxp.findall(_x('.//ttaf1:p')) or dfxp.findall('.//p')
+    paras = dfxp.findall(_x('.//ttml:p')) or dfxp.findall(_x('.//ttaf1:p')) or dfxp.findall(_x('.//ttaf1_0604:p')) or dfxp.findall('.//p')
 
     if not paras:
         raise ValueError('Invalid dfxp/TTML subtitle')