rzhxeo 2b35c9ef74 Merge branch 'master' into rtmpdump ...

Conflicts:
	youtube_dl/FileDownloader.py

Merge

2013-11-18 00:27:06 +01:00

..

extractor

[MTVIE] Try with RTMP URL if download fails

2013-11-17 22:11:40 +01:00

__init__.py

Save and restore console title (Fixes #1782)

2013-11-17 21:10:11 +01:00

__main__.py

…

aes.py

…

FileDownloader.py

Merge branch 'master' into rtmpdump

2013-11-18 00:27:06 +01:00

InfoExtractors.py

…

PostProcessor.py

FFmpegMetadataPP: don't enclose the values with " (fixes #1756)

2013-11-12 20:38:13 +01:00

update.py

Remove * imports

2013-11-17 16:47:52 +01:00

utils.py

…

version.py

release 2013.11.17

2013-11-17 22:14:13 +01:00

YoutubeDL.py

Allow --console-title when --quiet is given (Fixes #1783)

2013-11-17 21:12:50 +01:00