From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Thu, 24 Mar 2016 08:32:27 +0000 (+0800)
Subject: [generic] Extract Instagram embeds (#8817)
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=5a51775a58b901c63bb0b59e44a113ad16ceb236;p=youtube-dl

[generic] Extract Instagram embeds (#8817)
---

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 93e0563b5..12f2309fc 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -59,6 +59,7 @@ from .videomore import VideomoreIE
 from .googledrive import GoogleDriveIE
 from .jwplatform import JWPlatformIE
 from .digiteka import DigitekaIE
+from .instagram import InstagramIE
 
 
 class GenericIE(InfoExtractor):
@@ -1917,6 +1918,11 @@ class GenericIE(InfoExtractor):
             return self.url_result(
                 self._proto_relative_url(unescapeHTML(mobj.group(1))), 'Vine')
 
+        # Look for Instagram embeds
+        instagram_embed_url = InstagramIE._extract_embed_url(webpage)
+        if instagram_embed_url is not None:
+            return self.url_result(instagram_embed_url, InstagramIE.ie_key())
+
         def check_video(vurl):
             if YoutubeIE.suitable(vurl):
                 return True