am add9f820: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"

* commit 'add9f820eaeb180b5e72a4420995a54062cfabd7':
  MPEG2TSWriter: Correctly add padding using the adaptation field