From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Mon, 20 Jul 2015 17:34:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'yan12125/download-dash-segments' (#5886)
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=2ee8f5d80f8eb80a28c0012b32f1abff9b633c1c

Merge remote-tracking branch 'yan12125/download-dash-segments' (#5886)
---

2ee8f5d80f8eb80a28c0012b32f1abff9b633c1c
diff --cc youtube_dl/extractor/youtube.py
index e7f5c7861,939f5e61f..9a08924ef
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@@ -522,20 -516,24 +522,38 @@@ class YoutubeIE(YoutubeBaseInfoExtracto
                  'skip_download': 'requires avconv',
              }
          },
 +        # Extraction from multiple DASH manifests (https://github.com/rg3/youtube-dl/pull/6097)
 +        {
 +            'url': 'https://www.youtube.com/watch?v=FIl7x6_3R5Y',
 +            'info_dict': {
 +                'id': 'FIl7x6_3R5Y',
 +                'ext': 'mp4',
 +                'title': 'md5:7b81415841e02ecd4313668cde88737a',
 +                'description': 'md5:116377fd2963b81ec4ce64b542173306',
 +                'upload_date': '20150625',
 +                'uploader_id': 'dorappi2000',
 +                'uploader': 'dorappi2000',
 +                'formats': 'mincount:33',
 +            },
-         }
++        },
+         # DASH manifest with segment_list
+         {
+             'url': 'https://www.youtube.com/embed/CsmdDsKjzN8',
+             'md5': '8ce563a1d667b599d21064e982ab9e31',
+             'info_dict': {
+                 'id': 'CsmdDsKjzN8',
+                 'ext': 'mp4',
+                 'upload_date': '20150510',
+                 'uploader': 'Airtek',
+                 'description': 'Retransmisión en directo de la XVIII media maratón de Zaragoza.',
+                 'uploader_id': 'UCzTzUmjXxxacNnL8I3m4LnQ',
+                 'title': 'Retransmisión XVIII Media maratón Zaragoza 2015',
+             },
+             'params': {
+                 'youtube_include_dash_manifest': True,
+                 'format': '135',  # bestvideo
+             }
 -        }
++        },
      ]
  
      def __init__(self, *args, **kwargs):