commit | 898d5cdda2967938073d78cf3cd3135831451d3c | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Tue Aug 10 10:48:59 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 10 10:48:59 2010 -0700 |
tree | 7ec9756434a21bfc2970ba24576e5f42a4c78a61 | |
parent | 7c997d209b59a4dbfc1e869ba1a9b3f3015613f8 [diff] | |
parent | a04883412ec1a5dac3e83c3fd3c335ab9579a990 [diff] |
am a0488341: am 532d2ac5: Merge "Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer" into gingerbread Merge commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990' * commit 'a04883412ec1a5dac3e83c3fd3c335ab9579a990': Only check the codec specific data when the output buffer contains kKeyIsCodecConfig in MP4 writer