summary refs log tree commit diff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-24 10:37:52 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-24 10:37:52 +0200
commit32a09b43820fbc27dc29c0c98f517462fabd47d6 (patch)
tree3edb08fbb2c6ac7756fbeaa98d9323c153859505
parent870a7e6156d62675079b7971a90d7688fff7bd7a (diff)
parentb9a1252c9601db3e208eb76ab4c3d60f0fc1f7f2 (diff)
downloadyoutube-dl-32a09b43820fbc27dc29c0c98f517462fabd47d6.tar.gz
youtube-dl-32a09b43820fbc27dc29c0c98f517462fabd47d6.tar.xz
youtube-dl-32a09b43820fbc27dc29c0c98f517462fabd47d6.zip
Merge pull request #1113 from alexvh/master
[traileraddict] Allow all types of trailer URLs
-rw-r--r--youtube_dl/extractor/traileraddict.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/traileraddict.py b/youtube_dl/extractor/traileraddict.py
index 324bb6231..6f2fc2394 100644
--- a/youtube_dl/extractor/traileraddict.py
+++ b/youtube_dl/extractor/traileraddict.py
@@ -4,7 +4,7 @@ from .common import InfoExtractor
 
 
 class TrailerAddictIE(InfoExtractor):
-    _VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/trailer/([^/]+)/(?:trailer|feature-trailer)'
+    _VALID_URL = r'(?:http://)?(?:www\.)?traileraddict\.com/trailer/([^/]+)/(?:[^/]*trailer[^/]*)'
     _TEST = {
         u'url': u'http://www.traileraddict.com/trailer/prince-avalanche/trailer',
         u'file': u'76184.mp4',