summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-08-10 10:48:59 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-10 10:48:59 -0700
commitdfb23d72139d117e2c9534195a41e9811ef4c2e7 (patch)
treee322e5740941cb092c1291b54ec648b4e1785eb3 /opengl/tests/gl_basic/gl_basic.cpp
parentf2398fd0642dc988b5281ff1a724d0e4a90824bc (diff)
parentb084d125e649ee5f88578ce05459ed9c3ced6f71 (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
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions