aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-07-22 16:59:31 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2014-07-22 16:59:31 +0200
commit5198bf68fc970f87be266e10ed5a05e67037c7b1 (patch)
treee7c2a6f6f17f736f2e051cb112b05ab9a19b9260
parente00fc35dbe7cdba20d78ccbf7a2fb471d5356529 (diff)
parent8904e979dfe489e37bda369a5863bceecb56d490 (diff)
Merge remote-tracking branch 'origin/master'
-rw-r--r--youtube_dl/extractor/br.py2
-rw-r--r--youtube_dl/extractor/vodlocker.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/br.py b/youtube_dl/extractor/br.py
index 993360714..f7f2f713a 100644
--- a/youtube_dl/extractor/br.py
+++ b/youtube_dl/extractor/br.py
@@ -12,7 +12,7 @@ from ..utils import (
class BRIE(InfoExtractor):
IE_DESC = 'Bayerischer Rundfunk Mediathek'
- _VALID_URL = r'https?://(?:www\.)?br\.de/(?:[a-z0-9\-]+/)+(?P<id>[a-z0-9\-]+)\.html'
+ _VALID_URL = r'https?://(?:www\.)?br\.de/(?:[a-z0-9\-_]+/)+(?P<id>[a-z0-9\-_]+)\.html'
_BASE_URL = 'http://www.br.de'
_TESTS = [
diff --git a/youtube_dl/extractor/vodlocker.py b/youtube_dl/extractor/vodlocker.py
index 68c59364b..6d3b78749 100644
--- a/youtube_dl/extractor/vodlocker.py
+++ b/youtube_dl/extractor/vodlocker.py
@@ -10,7 +10,7 @@ from ..utils import (
class VodlockerIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?vodlocker.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
+ _VALID_URL = r'https?://(?:www\.)?vodlocker\.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
_TESTS = [{
'url': 'http://vodlocker.com/e8wvyzz4sl42',