OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
49f441e
f07cb53
)
Merge remote-tracking branch 'cus/stable'
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Jul 2013 22:57:00 +0000
(
00:57
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Jul 2013 22:57:04 +0000
(
00:57
+0200)
* cus/stable:
ffplay: assume 0 stream start time if start time is unset in duration check
ffplay: do not update audio clock with old audio pts if current frame is AV_NOPTS_VALUE
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge