From: Jean-Baptiste Queru <jbq@google.com>
Date: Wed, 15 Aug 2012 18:24:36 +0000 (-0700)
Subject: am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"
X-Git-Tag: android-x86-4.4-r1~662^2~54^2~34
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=add9f820eaeb180b5e72a4420995a54062cfabd7;p=android-x86%2Fframeworks-av.git

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

* commit '2c3d9b7b9e34c9122c0a568d6b1fb24404021f55':
  MPEG2TSWriter: Correctly add padding using the adaptation field
---

add9f820eaeb180b5e72a4420995a54062cfabd7