Merge branch 'fstirlitz-filmon'

2017-02-03 10:15:52 +01:00 · 2017-02-03 10:15:52 +01:00 · df0588a31f
commit df0588a31f
parent d7f9242e30 4ce3407d08
2 changed files with 182 additions and 0 deletions
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@ -299,6 +299,10 @@ from .fc2 import (
    FC2EmbedIE,
 )
 from .fczenit import FczenitIE
+from .filmon import (
+    FilmOnIE,
+    FilmOnChannelIE,
+)
 from .firstpost import FirstpostIE
 from .firsttv import FirstTVIE
 from .fivemin import FiveMinIE