am d866ed04: Merge "Remove optional video encoder: MPEG-4 SP" into jb-dev

* commit 'd866ed04ecb7b051b89abe7b479ab73a5c15f094':
  Remove optional video encoder: MPEG-4 SP