Merge remote-tracking branch 'rzhxeo/rtmpdump_live'
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 10 Nov 2013 11:38:40 +0000 (12:38 +0100)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Sun, 10 Nov 2013 11:38:40 +0000 (12:38 +0100)
commit1008bebaded30e0c1dcce33300fa4096331aec4b
treebf9a5b8e57fe6ec103414e76604afcb6894db0db
parentae84f879d77bab5ea6fd9a4d74b82b46a11c9072
parent0a43ddf3209e13f5e87b07c440e03a45deea3e57
Merge remote-tracking branch 'rzhxeo/rtmpdump_live'
youtube_dl/FileDownloader.py
youtube_dl/extractor/cinemassacre.py