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)
commitdfa50793d8541ff2c5603f7c3b727c0f6e551d8d
tree92aa91f28a4e3469b7513e46e74bd62439818b8d
parente2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1
parent58c3c7ae38b9c0f5837595eb4027bd2650ae4e09
Merge pull request #2153 from jaimeMF/ffmpeg-merger-check-install

Don’t try to merge the formats if ffmpeg or avconv are not installed