ffmpeg-install should be run as sudo
Merge pull request #55 from qadan/7.x

ffmpeg-install should be run as sudo
Updated watchdog calls with more info during derivatives generation.
mergin fun time
Merge pull request #1 from willtp87/7.x.errors

7.x.errors
Merge pull request #56 from MorganDawe/7.x

Updated watchdog calls with more info during derivatives generation.
Merge pull request #2 from Islandora/7.x

update 7.x
update build xml for jenkins
Merge pull request #57 from qadan/7.x

update build xml for jenkins
switch up mime depending on ds sent to viewer
Merge branch '7.x' of git://github.com/Islandora/islandora_solution_pack_video into 7.x
Merge pull request #59 from nhart/7.x

switch up mime depending on ds sent to viewer
Make the OGG derivative optional.
Extra newline.
Update #description.
Merge pull request #62 from jordandukart/7.x-Optional-OGG

Make the OGG derivative optional.
Add missing Drush command to remove OGGs.
Merge pull request #64 from jordandukart/7.x-missing-Drush

Add missing Drush command to remove OGGs.
Typos.
Merge pull request #65 from jordandukart/7.x-remaning

Typos.