From: Jaime Marquínez Ferrándiz <jaimeMF@users.noreply.github.com>
Date: Thu, 6 Nov 2014 21:23:14 +0000 (+0100)
Subject: Merge pull request #4076 from ghedo/direct_type
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9908e0352872b252494747346589922358aa0375;hp=-c;p=youtube-dl

Merge pull request #4076 from ghedo/direct_type

[generic] indicate when a direct video has been extracted
---

9908e0352872b252494747346589922358aa0375
diff --combined youtube_dl/extractor/generic.py
index 8dd11e202,8abc340b4..01d6a57f8
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@@ -7,12 -7,11 +7,12 @@@ import r
  
  from .common import InfoExtractor
  from .youtube import YoutubeIE
 -from ..utils import (
 +from ..compat import (
      compat_urllib_parse,
      compat_urlparse,
      compat_xml_parse_error,
 -
 +)
 +from ..utils import (
      determine_ext,
      ExtractorError,
      float_or_none,
@@@ -100,22 -99,6 +100,22 @@@ class GenericIE(InfoExtractor)
                  'uploader': 'Championat',
              },
          },
 +        {
 +            # https://github.com/rg3/youtube-dl/issues/3541
 +            'add_ie': ['Brightcove'],
 +            'url': 'http://www.kijk.nl/sbs6/leermijvrouwenkennen/videos/jqMiXKAYan2S/aflevering-1',
 +            'info_dict': {
 +                'id': '3866516442001',
 +                'ext': 'mp4',
 +                'title': 'Leer mij vrouwen kennen: Aflevering 1',
 +                'description': 'Leer mij vrouwen kennen: Aflevering 1',
 +                'uploader': 'SBS Broadcasting',
 +            },
 +            'skip': 'Restricted to Netherlands',
 +            'params': {
 +                'skip_download': True,  # m3u8 download
 +            },
 +        },
          # Direct link to a video
          {
              'url': 'http://media.w3.org/2010/05/sintel/trailer.mp4',
@@@ -576,6 -559,7 +576,7 @@@
              return {
                  'id': video_id,
                  'title': os.path.splitext(url_basename(url))[0],
+                 'direct': True,
                  'formats': [{
                      'format_id': m.group('format_id'),
                      'url': url,