diff --git a/README.md b/README.md index 731cea1e1..d68896202 100644 --- a/README.md +++ b/README.md @@ -397,6 +397,9 @@ which means you can modify it, redistribute it or use it however you like. postprocessors (default) --prefer-ffmpeg Prefer ffmpeg over avconv for running the postprocessors + --ffmpeg-location PATH Location of the ffmpeg/avconv binary; + either the path to the binary or its + containing directory. --exec CMD Execute a command on the file after downloading, similar to find's -exec syntax. Example: --exec 'adb push {} diff --git a/docs/supportedsites.md b/docs/supportedsites.md index 8bce8fede..894fa4323 100644 --- a/docs/supportedsites.md +++ b/docs/supportedsites.md @@ -1,4 +1,5 @@ # Supported sites + - **1tv**: Первый канал - **1up.com** - **220.ro** - **24video** @@ -60,6 +61,8 @@ - **Brightcove** - **BuzzFeed** - **BYUtv** + - **Camdemy** + - **CamdemyFolder** - **Canal13cl** - **canalc2.tv** - **Canalplus**: canalplus.fr, piwiplus.fr and d8.tv @@ -134,7 +137,6 @@ - **fernsehkritik.tv:postecke** - **Firedrive** - **Firstpost** - - **firsttv**: Видеоархив - Первый канал - **Flickr** - **Folketinget**: Folketinget (ft.dk; Danish parliament) - **Foxgay** @@ -174,6 +176,7 @@ - **Helsinki**: helsinki.fi - **HentaiStigma** - **HistoricFilms** + - **History** - **hitbox** - **hitbox:live** - **HornBunny** @@ -287,6 +290,8 @@ - **nowvideo**: NowVideo - **npo.nl** - **npo.nl:live** + - **npo.nl:radio** + - **npo.nl:radio:fragment** - **NRK** - **NRKTV** - **ntv.ru** @@ -527,6 +532,7 @@ - **XVideos** - **XXXYMovies** - **Yahoo**: Yahoo screen and movies + - **Yam** - **YesJapan** - **Ynet** - **YouJizz** diff --git a/youtube_dl/version.py b/youtube_dl/version.py index 492ddf2ea..e58c59969 100644 --- a/youtube_dl/version.py +++ b/youtube_dl/version.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -__version__ = '2015.02.11' +__version__ = '2015.02.16'