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

..

__init__.py

[downloader/__init__] Define proper __all__

2014-11-23 22:25:12 +01:00

common.py

Merge remote-tracking branch 'rupertbaxter2/master'

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

f4m.py

[downloader/f4m] Minor cleanup

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

hls.py

[downloader/hls] Respect the 'prefer_ffmpeg' option

2015-01-04 13:41:49 +01:00

http.py

Fix imports and general cleanup

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

mplayer.py

Remove unused import

2015-01-04 02:05:35 +01:00

rtmp.py

Improve code style

2014-12-17 00:06:41 +01:00