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:
ea9d51b
1503185
)
am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into...
author
Jamie Gennis
<jgennis@google.com>
Wed, 30 Nov 2011 18:50:49 +0000
(10:50 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 30 Nov 2011 18:50:49 +0000
(10:50 -0800)
* commit '
c040e1e77923d81050f2d3dbdac5d07e01be72f6
':
SurfaceMediaSource: use the vid enc usage bit
1
2
media/libstagefright/SurfaceMediaSource.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/SurfaceMediaSource.cpp
Simple merge