OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7596ce3
988aae8
)
Fix AMR decoder am: d061b5b
author
Marco Nelissen
<marcone@google.com>
Fri, 25 Mar 2016 17:23:28 +0000
(17:23 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 25 Mar 2016 17:23:28 +0000
(17:23 +0000)
am:
988aae8
* commit '
988aae8467be145c0513b8f5abb0f76f87112492
':
Fix AMR decoder
1
2
media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/codecs/amrnb/dec/SoftAMR.cpp
Simple merge