diff options
author | rupertbaxter2 <rupertbaxter2@yahoo.com> | 2014-08-13 04:22:45 -0700 |
---|---|---|
committer | rupertbaxter2 <rupertbaxter2@yahoo.com> | 2014-08-13 04:22:45 -0700 |
commit | f96252b913945a173ebf2388de0c01b401b90a3a (patch) | |
tree | 7548dfc2247efb507405b817f0223e517c4ced42 /youtube_dl/extractor/__init__.py | |
parent | 04b89c9026e14c16d3b53cbddf8654f354174245 (diff) | |
parent | 6f600ff5d6bda54d8128e6263a468a08edfc3353 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
-rw-r--r-- | youtube_dl/extractor/__init__.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index 23f53ba13..2ea2c73d2 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -225,9 +225,12 @@ from .nrk import ( from .ntv import NTVIE from .nytimes import NYTimesIE from .nuvid import NuvidIE -from .oe1 import OE1IE from .ooyala import OoyalaIE -from .orf import ORFIE +from .orf import ( + ORFTVthekIE, + ORFOE1IE, + ORFFM4IE, +) from .parliamentliveuk import ParliamentLiveUKIE from .pbs import PBSIE from .photobucket import PhotobucketIE |