Philipp Hagemeister 5f0d813d93 Merge remote-tracking branch 'rupertbaxter2/master' ...

Conflicts:
	youtube_dl/__init__.py
	youtube_dl/downloader/common.py

2015-01-23 12:05:01 +01:00

..

downloader

Merge remote-tracking branch 'rupertbaxter2/master'

2015-01-23 12:05:01 +01:00

extractor

[generic] Add support for Cinerama player (Fixes #4752)

2015-01-23 12:00:25 +01:00

postprocessor

Embed description and URL as MP4 tags

2015-01-18 15:01:05 -08:00

__init__.py

Merge remote-tracking branch 'rupertbaxter2/master'

2015-01-23 12:05:01 +01:00

__main__.py

[test_unicode_literals] Arm unicode_literals check

2014-11-26 20:01:22 +01:00

aes.py

[test_unicode_literals] Arm unicode_literals check

2014-11-26 20:01:22 +01:00

cache.py

[cache] Fix writing to paths with unicode characters

2014-11-19 00:02:24 +01:00

compat.py

[compat] Correct socket error class reference

2015-01-11 10:47:39 +01:00

jsinterp.py

Update jsinterp.py

2014-11-21 17:09:22 +08:00

options.py

Merge remote-tracking branch 'rupertbaxter2/master'

2015-01-23 12:05:01 +01:00

swfinterp.py

Fix imports and general cleanup

2014-12-13 12:35:45 +01:00

update.py

Add new option --source-address

2015-01-10 19:56:51 +01:00

utils.py

[utils] Simplify HTTPS socket creation

2015-01-23 11:15:18 +01:00

version.py

release 2015.01.23.2

2015-01-23 11:20:24 +01:00

YoutubeDL.py

Merge remote-tracking branch 'rupertbaxter2/master'

2015-01-23 12:05:01 +01:00