diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-01-18 20:42:51 -0800 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-01-18 20:42:51 -0800 |
| commit | dfa50793d8541ff2c5603f7c3b727c0f6e551d8d (patch) | |
| tree | 92aa91f28a4e3469b7513e46e74bd62439818b8d /.gitignore | |
| parent | e2b944cf4342a1920da4ec99e2d0e5f5dcf11cc1 (diff) | |
| parent | 58c3c7ae38b9c0f5837595eb4027bd2650ae4e09 (diff) | |
Merge pull request #2153 from jaimeMF/ffmpeg-merger-check-install
Don’t try to merge the formats if ffmpeg or avconv are not installed
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions