tree 608e7e4979258756955adeecdc0cde06596fb3a0
parent 5257d874dd68bf67b75c316f44e32e18ede0b469
parent 1f78badb5398c17526be021e3c9e3c4aa24536ec
author Andreas Huber <andih@google.com> 1285276808 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285276808 -0700

am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread

Merge commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275' into gingerbread-plus-aosp

* commit '7b2ed5d7d607e435b88ea75db3a1a43a00a86275':
  Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.