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:
03c1ecd
7445f0e
)
[automerger] MPEG4Source: fix fragmented read. am: 5c57e911b4 am: 7445f0e400
author
Wei Jia
<wjia@google.com>
Mon, 14 Aug 2017 22:22:17 +0000
(22:22 +0000)
committer
Wei Jia
<wjia@google.com>
Mon, 14 Aug 2017 22:22:17 +0000
(22:22 +0000)
Change-Id: I63d3ee56db210794a06b97f1283bebf978284f42
1
2
media/libstagefright/MPEG4Extractor.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/MPEG4Extractor.cpp
Simple merge