vichan-devel/vichan — pull request #101 by Admin-Kaf (2014-10-05 15:38:23+00:00)
Title: Added possibility to use avconv and avprobe instead of ffmpeg and ffprobe

Conflicts:
inc/lib/webm/posthandler.php