tree 0ea7ee80b5aacdff8e5b2ddf3aed9f8d919e422a
parent 5fb2aeefe780860b845bdb7dc088ccb7f0928476
parent 51dfe6d646ddcc5fc252aa4c19c9936d32af8ad7
author James Dong <jdong@google.com> 1281462265 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281462265 -0700

am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread

Merge commit '532d2ac5d5c06c3938c4999238d1051207bfe53c' into gingerbread-plus-aosp

* commit '532d2ac5d5c06c3938c4999238d1051207bfe53c':
  Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer