diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-03-09 03:01:28 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-03-09 03:01:28 +0100 |
| commit | dcca5819675df1e9d9a1caf00af0f98bb2ce511c (patch) | |
| tree | 47523d0851107978072ca6dd5c982dafe7abff47 /youtube_dl/extractor/__init__.py | |
| parent | d475b3384cd372d89c35b9b1c26499f1e9cc1915 (diff) | |
| parent | dd7831fe94a0fb8270e7fa3699677c7476a5cd83 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
youtube_dl/YoutubeDL.py
Diffstat (limited to 'youtube_dl/extractor/__init__.py')
| -rw-r--r-- | youtube_dl/extractor/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/youtube_dl/extractor/__init__.py b/youtube_dl/extractor/__init__.py index b489d5770..14172ca56 100644 --- a/youtube_dl/extractor/__init__.py +++ b/youtube_dl/extractor/__init__.py @@ -175,6 +175,7 @@ from .gameone import ( from .gamespot import GameSpotIE from .gamestar import GameStarIE from .gametrailers import GametrailersIE +from .gazeta import GazetaIE from .gdcvault import GDCVaultIE from .generic import GenericIE from .giantbomb import GiantBombIE @@ -363,6 +364,7 @@ from .pbs import PBSIE from .phoenix import PhoenixIE from .photobucket import PhotobucketIE from .planetaplay import PlanetaPlayIE +from .pladform import PladformIE from .played import PlayedIE from .playfm import PlayFMIE from .playvid import PlayvidIE |