projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[odnoklassniki] Improve _VALID_URL readability
[youtube-dl]
/
youtube_dl
/
extractor
/
tvplay.py
diff --git
a/youtube_dl/extractor/tvplay.py
b/youtube_dl/extractor/tvplay.py
index 46132eda1f3700bc51df6633b96723b4b2874ebb..84597b55e0f6047a1dccd1905cb4771949b3cf00 100644
(file)
--- a/
youtube_dl/extractor/tvplay.py
+++ b/
youtube_dl/extractor/tvplay.py
@@
-273,6
+273,8
@@
class TVPlayIE(InfoExtractor):
'ext': ext,
}
if video_url.startswith('rtmp'):
'ext': ext,
}
if video_url.startswith('rtmp'):
+ if smuggled_data.get('skip_rtmp'):
+ continue
m = re.search(
r'^(?P<url>rtmp://[^/]+/(?P<app>[^/]+))/(?P<playpath>.+)$', video_url)
if not m:
m = re.search(
r'^(?P<url>rtmp://[^/]+/(?P<app>[^/]+))/(?P<playpath>.+)$', video_url)
if not m:
@@
-434,6
+436,10
@@
class ViafreeIE(InfoExtractor):
return self.url_result(
smuggle_url(
'mtg:%s' % video_id,
return self.url_result(
smuggle_url(
'mtg:%s' % video_id,
- {'geo_countries': [
- compat_urlparse.urlparse(url).netloc.rsplit('.', 1)[-1]]}),
+ {
+ 'geo_countries': [
+ compat_urlparse.urlparse(url).netloc.rsplit('.', 1)[-1]],
+ # rtmp host mtgfs.fplive.net for viafree is unresolvable
+ 'skip_rtmp': True,
+ }),
ie=TVPlayIE.ie_key(), video_id=video_id)
ie=TVPlayIE.ie_key(), video_id=video_id)