projects / youtube-dl / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2b944c 58c3c7a)
Merge pull request #2153 from jaimeMF/ffmpeg-merger-check-install
authorPhilipp Hagemeister <phihag@phihag.de>
Sun, 19 Jan 2014 04:42:51 +0000 (20:42 -0800)
committerPhilipp Hagemeister <phihag@phihag.de>
Sun, 19 Jan 2014 04:42:51 +0000 (20:42 -0800)
Don’t try to merge the formats if ffmpeg or avconv are not installed


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.