diff options
| author | Tithen-Firion <Tithen-Firion@users.noreply.github.com> | 2017-05-04 11:00:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 11:00:06 +0200 |
| commit | c89267d31ad99eb5b1a87cd354de5280a2a087b1 (patch) | |
| tree | 8bb3b01cd088d0646089344bddd3d4ff272c0065 /youtube_dl/extractor/vidio.py | |
| parent | 7552f96352f35cd877e52fd0770b77ba1856fc62 (diff) | |
| parent | 0c265486016b06342fb257966474ce591667aaff (diff) | |
Merge branch 'master' into openload-phantomjs-method
Diffstat (limited to 'youtube_dl/extractor/vidio.py')
| -rw-r--r-- | youtube_dl/extractor/vidio.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/vidio.py b/youtube_dl/extractor/vidio.py index 4e4b4e38c..701bb1d01 100644 --- a/youtube_dl/extractor/vidio.py +++ b/youtube_dl/extractor/vidio.py @@ -49,8 +49,11 @@ class VidioIE(InfoExtractor): thumbnail = clip.get('image') m3u8_url = m3u8_url or self._search_regex( - r'data(?:-vjs)?-clip-hls-url=(["\'])(?P<url>.+?)\1', webpage, 'hls url') - formats = self._extract_m3u8_formats(m3u8_url, display_id, 'mp4', entry_protocol='m3u8_native') + r'data(?:-vjs)?-clip-hls-url=(["\'])(?P<url>(?!\1).+)\1', + webpage, 'hls url') + formats = self._extract_m3u8_formats( + m3u8_url, display_id, 'mp4', entry_protocol='m3u8_native') + self._sort_formats(formats) duration = int_or_none(duration or self._search_regex( r'data-video-duration=(["\'])(?P<duartion>\d+)\1', webpage, 'duration')) |