OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
510c174
0e38cd3
)
am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 audio...
author
Andreas Huber
<andih@google.com>
Wed, 18 Aug 2010 20:38:49 +0000
(13:38 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 18 Aug 2010 20:38:49 +0000
(13:38 -0700)
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.
Trivial merge