Philipp Hagemeister 45598f1578 Merge remote-tracking branch 'aft90/merge-output-format' ...

Conflicts:
	youtube_dl/YoutubeDL.py

2015-01-10 01:59:14 +01:00

..

downloader

[downloader/f4m] Minor cleanup

2015-01-05 21:12:33 +02:00

extractor

[netzkino] Add new extractor (Fixes #4669)

2015-01-09 23:59:18 +01:00

postprocessor

[ffmpeg] Correctly encode paths on Windows

2015-01-09 19:02:07 +01:00

__init__.py

Passing the option into the main program's arguments

2015-01-10 00:03:11 +00:00

__main__.py

…

aes.py

…

cache.py

…

compat.py

[compat] Simplify kwarg detection code

2014-12-12 12:42:35 +01:00

jsinterp.py

…

options.py

Added an option to specify an output format for merges when downloading separate video & audio

2015-01-09 22:03:56 +00:00

swfinterp.py

Fix imports and general cleanup

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

update.py

[update] Use utils HTTPS handler (Fixes #4666)

2015-01-09 20:20:48 +01:00

utils.py

[netzkino] Add new extractor (Fixes #4669)

2015-01-09 23:59:18 +01:00

version.py

release 2015.01.09.2

2015-01-09 23:59:29 +01:00

YoutubeDL.py

Merge remote-tracking branch 'aft90/merge-output-format'

2015-01-10 01:59:14 +01:00