From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 8 Apr 2016 16:48:08 +0000 (+0600)
Subject: [extractor/common] Support arbitrary format strings for template based identifiers... 
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=fb38aa8b53d25606d2582e1043d09ad1a077bf61;p=youtube-dl

[extractor/common] Support arbitrary format strings for template based identifiers in mpd manifests (Closes #9119, closes #9120)
---

diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py
index 2b40f3b7c..a7324af5c 100644
--- a/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@ -1534,7 +1534,7 @@ class InfoExtractor(object):
                             media_template = representation_ms_info['media_template']
                             media_template = media_template.replace('$RepresentationID$', representation_id)
                             media_template = re.sub(r'\$(Number|Bandwidth)\$', r'%(\1)d', media_template)
-                            media_template = re.sub(r'\$(Number|Bandwidth)%(\d+)\$', r'%(\1)\2d', media_template)
+                            media_template = re.sub(r'\$(Number|Bandwidth)%([^$]+)\$', r'%(\1)\2', media_template)
                             media_template.replace('$$', '$')
                             representation_ms_info['segment_urls'] = [
                                 media_template % {