From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 28 Aug 2015 15:27:36 +0000 (+0600)
Subject: [mtvservices] Fix mediagen URL generation
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=56f447be9fa196bceafbacb6526cad7c122a30ea;p=youtube-dl

[mtvservices] Fix mediagen URL generation
---

diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index f2d0638bf..56b255599 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -114,7 +114,8 @@ class MTVServicesInfoExtractor(InfoExtractor):
         # Remove the templates, like &device={device}
         mediagen_url = re.sub(r'&[^=]*?={.*?}(?=(&|$))', '', mediagen_url)
         if 'acceptMethods' not in mediagen_url:
-            mediagen_url += '&acceptMethods=fms'
+            mediagen_url += '&' if '?' in mediagen_url else '?'
+            mediagen_url += 'acceptMethods=fms'
 
         mediagen_doc = self._download_xml(mediagen_url, video_id,
                                           'Downloading video urls')