Merge "I accidentally broken passion encoding while working around problems with the sholes encoder." into kraken
tree: 4c6332d4f123745e5c4c3281067ea99c1b32921d
  1. camera/
  2. cmds/
  3. include/
  4. media/