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:
d4a3cae
839d11d
)
am 839d11d1: Merge changes I0a744dc7,Id993a70d
author
Mark Salyzyn
<salyzyn@google.com>
Tue, 15 Apr 2014 22:35:00 +0000
(22:35 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 15 Apr 2014 22:35:00 +0000
(22:35 +0000)
* commit '
839d11d1f7be9dff2f06c7d30a9eb39cb6782078
':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
1
2
media/libstagefright/OMXCodec.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/libstagefright/omx/GraphicBufferSource.cpp
patch
|
diff1
|
diff2
|
blob
|
history
services/audioflinger/Tracks.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/OMXCodec.cpp
Simple merge
diff --cc
media/libstagefright/omx/GraphicBufferSource.cpp
Simple merge
diff --cc
services/audioflinger/Tracks.cpp
Simple merge