Sergey M․ 98b8ec8616 Merge branch 'best-fallback-on-outdated-avconv' of https://github.com/dstftw/youtube-dl into dstftw-best-fallback-on-outdated-avconv ...

Conflicts:
	youtube_dl/YoutubeDL.py

2015-05-14 15:18:58 +06:00

..

__init__.py

…

common.py

…

embedthumbnail.py

…

execafterdownload.py

…

ffmpeg.py

…

metadatafromtitle.py

…

xattrpp.py

…