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:
9abb740
12bd1d2
)
Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into...
author
Abhishek Arya
<aarya@google.com>
Tue, 18 Aug 2015 01:31:42 +0000
(
01:31
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 18 Aug 2015 01:31:42 +0000
(
01:31
+0000)
1
2
media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
patch
|
diff1
|
diff2
|
blob
|
history
media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/codecs/m4v_h263/dec/src/pvdec_api.cpp
Simple merge
diff --cc
media/libstagefright/codecs/m4v_h263/enc/src/mp4enc_api.cpp
Simple merge