diff options
| author | James Dong <jdong@google.com> | 2010-08-10 10:44:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 10:44:25 -0700 |
| commit | b084d125e649ee5f88578ce05459ed9c3ced6f71 (patch) | |
| tree | 509b165a9c92abd77498666313483d9216648e5b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a45a550667c69fe66222445c68c35d3a23fc8ba3 (diff) | |
| parent | c4d25e70d65018ed2dec10eddadf16737cafc8ef (diff) | |
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
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions