diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2013-10-22 22:30:06 +0200 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2013-10-22 22:30:06 +0200 |
commit | 7853cc5ae1f9068f3bdf59ce959cb70645b9bc20 (patch) | |
tree | 82f0855ff96d3027c2026d2460a2a6c14d0fa6cc /youtube_dl/extractor/videodetective.py | |
parent | 586a91b67f6fe7254beefc3831b4e4649f84f0ce (diff) | |
parent | b028e96144a2bf1ba84dd6d11f1cc13a2928c438 (diff) |
Merge remote-tracking branch 'origin/master'
Conflicts:
youtube_dl/YoutubeDL.py
Diffstat (limited to 'youtube_dl/extractor/videodetective.py')
-rw-r--r-- | youtube_dl/extractor/videodetective.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/videodetective.py b/youtube_dl/extractor/videodetective.py index d89f84094..265dd5b91 100644 --- a/youtube_dl/extractor/videodetective.py +++ b/youtube_dl/extractor/videodetective.py @@ -16,7 +16,7 @@ class VideoDetectiveIE(InfoExtractor): u'info_dict': { u'title': u'KICK-ASS 2', u'description': u'md5:65ba37ad619165afac7d432eaded6013', - u'duration': 138, + u'duration': 135, }, } |