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:
6687216
5ecfcc7
)
Merge remote-tracking branch 'cus/stable'
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 6 Nov 2013 09:58:58 +0000
(10:58 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 6 Nov 2013 09:59:03 +0000
(10:59 +0100)
* cus/stable:
ffplay: add smarter method for determining video picture duration
ffplay: add frame duration estimated from frame rate to VideoPicture
ffplay: avoid code duplication in AVFILTER enabled and disabled case
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Trivial merge