summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2015-02-28 21:24:25 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2015-02-28 21:24:25 +0100
commit01349011088b10861e283c245f5da56aa3d5fba0 (patch)
tree6b6a63f2b1de3abbeffb491c45ce95a29dde5958
parenteee6293d572b85c700ef645ac96b1816cb45901d (diff)
release 2015.02.282015.02.28
-rw-r--r--README.md2
-rw-r--r--docs/supportedsites.md5
-rw-r--r--youtube_dl/version.py2
3 files changed, 7 insertions, 2 deletions
diff --git a/README.md b/README.md
index 2c53e22115..04f664cd35 100644
--- a/README.md
+++ b/README.md
@@ -408,6 +408,8 @@ which means you can modify it, redistribute it or use it however you like.
downloading, similar to find's -exec
syntax. Example: --exec 'adb push {}
/sdcard/Music/ && rm {}'
+ --convert-subtitles FORMAT Convert the subtitles to other format
+ (currently supported: srt|ass|vtt)
# CONFIGURATION
diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 49b4ac8c1e..062cb3d626 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -210,6 +210,7 @@
- **Jove**
- **jpopsuki.tv**
- **Jukebox**
+ - **Kaltura**
- **Kankan**
- **Karaoketv**
- **keek**
@@ -308,6 +309,7 @@
- **Nuvid**
- **NYTimes**
- **ocw.mit.edu**
+ - **Odnoklassniki**
- **OktoberfestTV**
- **on.aol.com**
- **Ooyala**
@@ -334,6 +336,7 @@
- **PornoXO**
- **PromptFile**
- **prosiebensat1**: ProSiebenSat.1 Digital
+ - **Puls4**
- **Pyvideo**
- **QuickVid**
- **R7**
@@ -412,7 +415,7 @@
- **StreamCZ**
- **StreetVoice**
- **SunPorno**
- - **SVTPlay**
+ - **SVTPlay**: SVT Play and Öppet arkiv
- **SWRMediathek**
- **Syfy**
- **SztvHu**
diff --git a/youtube_dl/version.py b/youtube_dl/version.py
index cf3e28bbe6..5582348bae 100644
--- a/youtube_dl/version.py
+++ b/youtube_dl/version.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-__version__ = '2015.02.26.2'
+__version__ = '2015.02.28'