OSDN Git Service
(root)
/
android-x86
/
external-stagefright-plugins.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a54c041
)
Revert "stagefright-plugins: Fix timestamp calculation"
author
Keith Mok
<kmok@cyngn.com>
Tue, 5 Apr 2016 21:44:05 +0000
(14:44 -0700)
committer
Keith Mok
<kmok@cyngn.com>
Tue, 5 Apr 2016 21:49:28 +0000
(14:49 -0700)
This reverts commit
a54c041a1755b46843b8dab736eccee5d27602d9
.
Change-Id: I044330eb11c981eb5be0e865f4e8bc083b40fd78
extractor/FFmpegExtractor.cpp
patch
|
blob
|
history
diff --git
a/extractor/FFmpegExtractor.cpp
b/extractor/FFmpegExtractor.cpp
index
9ab9938
..
3e150bb
100644
(file)
--- a/
extractor/FFmpegExtractor.cpp
+++ b/
extractor/FFmpegExtractor.cpp
@@
-1525,7
+1525,7
@@
retry:
}
if (pktTS != AV_NOPTS_VALUE)
- timeUs = av_rescale_q(pktTS, mStream->time_base, AV_TIME_BASE_Q)
+
startTimeUs;
+ timeUs = av_rescale_q(pktTS, mStream->time_base, AV_TIME_BASE_Q)
-
startTimeUs;
else
timeUs = SF_NOPTS_VALUE; //FIXME AV_NOPTS_VALUE is negative, but stagefright need positive