diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 21:47:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 21:47:53 +0100 |
| commit | cee63a14835267a8a3665ccc93b9f9c34a225b5e (patch) | |
| tree | 1c3d55f3667204ece7979eadcd04618401f46a5d /libavfilter/af_astreamsync.c | |
| parent | 6909a611d2057d50980c414a676abeab14174c15 (diff) | |
| parent | 28031404571bb69a1d685341cfc1cd737ecb9681 (diff) | |
| download | ffmpeg-cee63a14835267a8a3665ccc93b9f9c34a225b5e.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: calculate last frame duration from vp->pts instead of frame_last_pts
ffplay: simplify early frame drop code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_astreamsync.c')
0 files changed, 0 insertions, 0 deletions