am b7b8de88: am 0924dd88: am 2aa37a7d: Merge "recordvideo: Add an option for choosing software encoders"

* commit 'b7b8de8878a32cd62916b29cf2cbf4f7437adbea':
  recordvideo: Add an option for choosing software encoders