diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-06 10:58:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-06 10:59:03 +0100 |
| commit | 1b3d3a9c87f138b92f26a8b34873913b94f8999a (patch) | |
| tree | ef9f2b25cf73bdecae4ae3f94124d124f626fca0 /libavcodec | |
| parent | 66872161cbb7187b0c20267653d415ef700aca35 (diff) | |
| parent | 5ecfcc7dff04ff0e86d8b6b3a33709ae956dfef7 (diff) | |
| download | ffmpeg-1b3d3a9c87f138b92f26a8b34873913b94f8999a.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* 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>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions