From: Sergey M․ <dstftw@gmail.com>
Date: Fri, 12 Feb 2016 23:01:20 +0000 (+0600)
Subject: [youtube] Improve multifeed videos extraction (Closes #8536)
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=6863631c2696f93123ae5ceca1e261311f0d8925;p=youtube-dl

[youtube] Improve multifeed videos extraction (Closes #8536)
---

diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index 382d52cb6..97d621907 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -1196,9 +1196,12 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
             if not self._downloader.params.get('noplaylist'):
                 entries = []
                 feed_ids = []
-                multifeed_metadata_list = compat_urllib_parse_unquote_plus(video_info['multifeed_metadata_list'][0])
+                multifeed_metadata_list = video_info['multifeed_metadata_list'][0]
                 for feed in multifeed_metadata_list.split(','):
-                    feed_data = compat_parse_qs(feed)
+                    # Unquote should take place before split on comma (,) since textual
+                    # fields may contain comma as well (see
+                    # https://github.com/rg3/youtube-dl/issues/8536)
+                    feed_data = compat_parse_qs(compat_urllib_parse_unquote_plus(feed))
                     entries.append({
                         '_type': 'url_transparent',
                         'ie_key': 'Youtube',