From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Wed, 29 Jul 2015 19:55:20 +0000 (+0200)
Subject: Merge remote-tracking branch 'dstftw/multifeed-videos' (closes #6360)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=34866b4836eab8dd2fcaae88dc1ed5c79a742c92

Merge remote-tracking branch 'dstftw/multifeed-videos' (closes #6360)
---

34866b4836eab8dd2fcaae88dc1ed5c79a742c92
diff --cc youtube_dl/extractor/youtube.py
index 4c449fd74,8a5ef2e70..67a1df9a0
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@@ -1076,30 -1171,6 +1175,10 @@@ class YoutubeIE(YoutubeBaseInfoExtracto
          else:
              video_categories = None
  
 +        video_tags = [
 +            unescapeHTML(m.group('content'))
 +            for m in re.finditer(self._meta_regex('og:video:tag'), video_webpage)]
 +
-         # description
-         video_description = get_element_by_id("eow-description", video_webpage)
-         if video_description:
-             video_description = re.sub(r'''(?x)
-                 <a\s+
-                     (?:[a-zA-Z-]+="[^"]+"\s+)*?
-                     title="([^"]+)"\s+
-                     (?:[a-zA-Z-]+="[^"]+"\s+)*?
-                     class="yt-uix-redirect-link"\s*>
-                 [^<]+
-                 </a>
-             ''', r'\1', video_description)
-             video_description = clean_html(video_description)
-         else:
-             fd_mobj = re.search(r'<meta name="description" content="([^"]+)"', video_webpage)
-             if fd_mobj:
-                 video_description = unescapeHTML(fd_mobj.group(1))
-             else:
-                 video_description = ''
- 
          def _extract_count(count_name):
              return str_to_int(self._search_regex(
                  r'-%s-button[^>]+><span[^>]+class="yt-uix-button-content"[^>]*>([\d,]+)</span>'