projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fstirlitz-filmon'
[youtube-dl]
/
youtube_dl
/
extractor
/
extractors.py
diff --git
a/youtube_dl/extractor/extractors.py
b/youtube_dl/extractor/extractors.py
index 915291f7464169fe75da5b8de16610d2fe5fd500..aa235bec1aeef1090c30e7a7b4f4af3cdfece6c2 100644
(file)
--- a/
youtube_dl/extractor/extractors.py
+++ b/
youtube_dl/extractor/extractors.py
@@
-82,7
+82,7
@@
from .awaan import (
)
from .azmedien import (
AZMedienIE,
)
from .azmedien import (
AZMedienIE,
- AZMedien
Show
IE,
+ AZMedien
Playlist
IE,
)
from .azubu import AzubuIE, AzubuLiveIE
from .baidu import BaiduVideoIE
)
from .azubu import AzubuIE, AzubuLiveIE
from .baidu import BaiduVideoIE
@@
-103,7
+103,10
@@
from .beatport import BeatportIE
from .bet import BetIE
from .bigflix import BigflixIE
from .bild import BildIE
from .bet import BetIE
from .bigflix import BigflixIE
from .bild import BildIE
-from .bilibili import BiliBiliIE
+from .bilibili import (
+ BiliBiliIE,
+ BiliBiliBangumiIE,
+)
from .biobiochiletv import BioBioChileTVIE
from .biqle import BIQLEIE
from .bleacherreport import (
from .biobiochiletv import BioBioChileTVIE
from .biqle import BIQLEIE
from .bleacherreport import (
@@
-296,6
+299,10
@@
from .fc2 import (
FC2EmbedIE,
)
from .fczenit import FczenitIE
FC2EmbedIE,
)
from .fczenit import FczenitIE
+from .filmon import (
+ FilmOnIE,
+ FilmOnChannelIE,
+)
from .firstpost import FirstpostIE
from .firsttv import FirstTVIE
from .fivemin import FiveMinIE
from .firstpost import FirstpostIE
from .firsttv import FirstTVIE
from .fivemin import FiveMinIE
@@
-415,6
+422,7
@@
from .internetvideoarchive import InternetVideoArchiveIE
from .iprima import IPrimaIE
from .iqiyi import IqiyiIE
from .ir90tv import Ir90TvIE
from .iprima import IPrimaIE
from .iqiyi import IqiyiIE
from .ir90tv import Ir90TvIE
+from .itv import ITVIE
from .ivi import (
IviIE,
IviCompilationIE
from .ivi import (
IviIE,
IviCompilationIE
@@
-667,6
+675,7
@@
from .nrk import (
NRKTVIE,
NRKTVDirekteIE,
NRKTVEpisodesIE,
NRKTVIE,
NRKTVDirekteIE,
NRKTVEpisodesIE,
+ NRKTVSeriesIE,
)
from .ntvde import NTVDeIE
from .ntvru import NTVRuIE
)
from .ntvde import NTVDeIE
from .ntvru import NTVRuIE