diff options
| author | remitamine <remitamine@gmail.com> | 2015-12-03 20:33:22 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2015-12-03 20:33:22 +0100 |
| commit | 78653a33aa00ba5205940c2baac5d9f019795b88 (patch) | |
| tree | 246fd038effd402bc66de4c8afb36e6c318efcaa /youtube_dl/extractor/odnoklassniki.py | |
| parent | 77302fe5c989b9cafcb675c0a03642b80fa557ff (diff) | |
| parent | 24dc1ed715239f85eb3d5f71a707da1dd2bc7773 (diff) | |
Merge remote-tracking branch 'upstream/master' into bliptv
Diffstat (limited to 'youtube_dl/extractor/odnoklassniki.py')
| -rw-r--r-- | youtube_dl/extractor/odnoklassniki.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/odnoklassniki.py b/youtube_dl/extractor/odnoklassniki.py index ccc88cfb1..184c7a323 100644 --- a/youtube_dl/extractor/odnoklassniki.py +++ b/youtube_dl/extractor/odnoklassniki.py @@ -13,7 +13,7 @@ from ..utils import ( class OdnoklassnikiIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?(?:odnoklassniki|ok)\.ru/(?:video|web-api/video/moviePlayer)/(?P<id>[\d-]+)' + _VALID_URL = r'https?://(?:www\.)?(?:odnoklassniki|ok)\.ru/(?:video(?:embed)?|web-api/video/moviePlayer)/(?P<id>[\d-]+)' _TESTS = [{ # metadata in JSON 'url': 'http://ok.ru/video/20079905452', @@ -66,6 +66,9 @@ class OdnoklassnikiIE(InfoExtractor): }, { 'url': 'http://www.ok.ru/video/20648036891', 'only_matching': True, + }, { + 'url': 'http://www.ok.ru/videoembed/20648036891', + 'only_matching': True, }] def _real_extract(self, url): |