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:
d8192c9
e1e8ea6
)
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am: 7da8bef65e...
author
Chong Zhang
<chz@google.com>
Tue, 18 Jul 2017 22:37:46 +0000
(22:37 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 18 Jul 2017 22:37:46 +0000
(22:37 +0000)
am:
e1e8ea6a19
Change-Id: I10c20451e88d85fd8a9a2ba24456708ca3612f53
1
2
media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libstagefright/codecs/mpeg2dec/SoftMPEG2.cpp
Simple merge