12 Commits

Author SHA1 Message Date
Mark Lee
1037943c8f Merge branch 'master' into multipart_videos
Conflicts:
	youtube_dl/extractor/common.py
	youtube_dl/extractor/mtv.py
	youtube_dl/options.py
	youtube_dl/postprocessor/__init__.py
	youtube_dl/postprocessor/ffmpeg.py
2014-11-29 19:07:46 -08:00
Philipp Hagemeister
dcddc10a50 [test_unicode_literals] Arm unicode_literals check
From now on, the line

from __future__ import unicode_literals

should be contained in every single Python file lest we run into any more 2.x/3.x issues.
Going forward, we're likely to develop on 3.x only and would likely miss subtle bugs otherwise.
2014-11-26 20:01:22 +01:00
Philipp Hagemeister
d28b517154 [YoutubeDL] Output avconv/ffmpeg versions if -v is given 2014-10-26 16:31:52 +01:00
Mark Lee
46fcc42c55 Merge branch 'master' into multipart_videos
Conflicts:
	test/helper.py
	youtube_dl/__init__.py
	youtube_dl/extractor/common.py
	youtube_dl/extractor/tudou.py
2014-09-16 07:43:21 -07:00
mcd1992
a2360a4c80 Moved from os.system to subprocess.call 2014-08-24 14:38:43 -05:00
mcd1992
a7cacbca2b Implemented --exec option. 2014-08-24 14:38:43 -05:00
Mark Lee
833600e3de Merge branch 'master' of https://github.com/rg3/youtube-dl into multipart_videos 2014-04-15 12:41:03 -07:00
pulpe
149254d0d5 fix ffmpeg error, if youtube-dl runs more than once with --embed-thumbnail with same video 2014-03-26 15:22:52 +01:00
pulpe
0c14e2fbe3 add post processor 2014-03-26 15:22:51 +01:00
Mark Lee
44e5eded77 Add video joiner class to postprocessor module 2014-03-25 19:49:17 -07:00
Philipp Hagemeister
496c19234c Split postprocessor package into multiple modules 2014-01-07 05:59:22 +01:00
Philipp Hagemeister
56327689a2 Move postprocessor into its own package 2014-01-07 05:49:17 +01:00