OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bbb85c8
897e27b
)
Merge "Connect MediaRecorder Native to SurfaceMediaSource"
author
Pannag Sanketi
<psanketi@google.com>
Fri, 22 Jul 2011 23:42:41 +0000
(16:42 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 22 Jul 2011 23:42:41 +0000
(16:42 -0700)
1
2
include/media/stagefright/SurfaceMediaSource.h
patch
|
diff1
|
diff2
|
blob
|
history
media/libstagefright/SurfaceMediaSource.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
include/media/stagefright/SurfaceMediaSource.h
Simple merge
diff --cc
media/libstagefright/SurfaceMediaSource.cpp
Simple merge
OSDN Git Service
