aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-09-25 01:58:49 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-09-25 01:59:02 +0200
commit6b08cdf626afc71740e539a83ef570999df2c50b (patch)
tree012760e53b4b0215a7cecc70c4e6381c669d9cdd /youtube_dl
parentb686fc18dacaa6994c646c171368b99e168b619a (diff)
[youtube] Support for embedded /p players (Fixes #3821)
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/generic.py2
-rw-r--r--youtube_dl/extractor/youtube.py7
2 files changed, 8 insertions, 1 deletions
diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index a3bfeb174..0dcbb39db 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -631,7 +631,7 @@ class GenericIE(InfoExtractor):
)
(["\'])
(?P<url>(?:https?:)?//(?:www\.)?youtube(?:-nocookie)?\.com/
- (?:embed|v)/.+?)
+ (?:embed|v|p)/.+?)
\1''', webpage)
if matches:
return _playlist_from_matches(
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index ae9564862..99198e380 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -1068,6 +1068,13 @@ class YoutubePlaylistIE(YoutubeBaseInfoExtractor):
'info_dict': {
'title': 'JODA15',
}
+ }, {
+ 'note': 'Embedded SWF player',
+ 'url': 'http://www.youtube.com/p/YN5VISEtHet5D4NEvfTd0zcgFk84NqFZ?hl=en_US&fs=1&rel=0',
+ 'playlist_count': 4,
+ 'info_dict': {
+ 'title': 'JODA7',
+ }
}]
def _real_initialize(self):