diff options
| author | Andreas Huber <andih@google.com> | 2010-08-18 13:38:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-18 13:38:49 -0700 |
| commit | b6b01e24dde11bb7a712d1e707132d3eecdd7edb (patch) | |
| tree | 0a610363214641b4366da2e1970e226fe739d9f3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 510c17454e0cc2325d28fb7c26ea76d86154eddc (diff) | |
| parent | 0e38cd33b65437c514719fdbd5c5a8df9b3c57e4 (diff) | |
am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us." into gingerbread
Merge commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68' into gingerbread-plus-aosp
* commit '0324ce9a1e21ed66e00d6560c27a6faf6d151f68':
Be more lenient when validating ESDS information in mp4 audio tracks. Allow the absence of any codec specific data and assume that the mpeg4 headers are not lying to us.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions