aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-11-27 12:25:51 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2012-11-27 12:25:51 +0100
commited7516c69dbd676d0d98581756a483f19407fae4 (patch)
tree6046daf952a210297e950e7a60350ab01b447742
parent9fb3bfb45a01bb5bab91e210016f00b289b1fb1b (diff)
parent89af8e9d32f550bdf00da9eab3288ad1e104d3b3 (diff)
downloadyoutube-dl-ed7516c69dbd676d0d98581756a483f19407fae4.tar.xz
Merge remote-tracking branch 'chrisjrn/master'
-rw-r--r--youtube_dl/InfoExtractors.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
index 35ba6cc5c..3cdce3b25 100644
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@ -2361,6 +2361,17 @@ class ComedyCentralIE(InfoExtractor):
# For now, just pick the highest bitrate
format,video_url = turls[-1]
+ # Patch to download from alternative CDN, which does not
+ # break on current RTMPDump builds
+
+
+ broken_cdn = "rtmpe://viacomccstrmfs.fplive.net/viacomccstrm/gsp.comedystor/"
+ better_cdn = "rtmpe://cp10740.edgefcs.net/ondemand/mtvnorigin/gsp.comedystor/"
+
+ if video_url.startswith(broken_cdn):
+ video_url = video_url.replace(broken_cdn, better_cdn)
+
+
effTitle = showId + u'-' + epTitle
info = {
'id': shortMediaId,
@@ -2372,7 +2383,7 @@ class ComedyCentralIE(InfoExtractor):
'format': format,
'thumbnail': None,
'description': officialTitle,
- 'player_url': playerUrl
+ 'player_url': None #playerUrl
}
results.append(info)