Mark Lee
5d0495f7b4
Merge branch 'master' of https://github.com/rg3/youtube-dl into multipart_videos
2014-04-02 08:40:37 -07:00
Philipp Hagemeister
62fec3b2ff
Add new --encoding option ( Fixes #2650 )
2014-03-30 06:08:22 +02:00
Mark Lee
58e55dbd3d
Merge branch 'multipart_videos' of https://github.com/jaimemf/youtube-dl into multipart_videos
...
Conflicts:
test/test_download.py
youtube_dl/YoutubeDL.py
youtube_dl/__init__.py
youtube_dl/extractor/common.py
youtube_dl/postprocessor/ffmpeg.py
2014-03-25 19:45:31 -07:00
Jaime Marquínez Ferrándiz
e103fd46ca
FFmpegMergerPP: Print an info message with the destination before running ffmpeg
2014-01-17 14:31:23 +01:00
Jaime Marquínez Ferrándiz
76b1bd672d
Add ‘--prefer-avconv’ and ‘--prefer-ffmpeg’ options ( #2115 )
...
Affects the ffmpeg post processors, if ‘--prefer-ffmpeg’ is given and both avconv and ffmpeg are installed, it will use ffmpeg. Otherwise it will follow the old behaviour.
2014-01-08 17:53:34 +01:00
Philipp Hagemeister
d70ad093af
Move check_executable into a helper ufnction
2014-01-07 06:23:41 +01:00
Philipp Hagemeister
496c19234c
Split postprocessor package into multiple modules
2014-01-07 05:59:22 +01:00