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:
0662f5b
341ab6e
)
Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev
author
Chong Zhang
<chz@google.com>
Wed, 4 Feb 2015 23:24:38 +0000
(23:24 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 4 Feb 2015 23:24:38 +0000
(23:24 +0000)
1
2
media/libmediaplayerservice/nuplayer/NuPlayer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libmediaplayerservice/nuplayer/NuPlayer.cpp
Simple merge
OSDN Git Service
