diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 03:18:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-29 03:18:35 +0100 |
| commit | 55a5ded67e0eabe4e81577feb92fb530cd618cf7 (patch) | |
| tree | db77ccee57baa479c8a09312416706c300c58792 /libavutil/file.c | |
| parent | 1eb8809a4178b180045d920d45727328186103c5 (diff) | |
| parent | f7eb50f3c0704a0d6e87dd218fc948b82a5e6329 (diff) | |
| download | ffmpeg-55a5ded67e0eabe4e81577feb92fb530cd618cf7.tar.gz | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: increase maximum frame duration to 1 hour for streams without TS discontinuity
ffplay: fix updating external clock after seeking
ffplay: disallow seeking before the start of the file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file.c')
0 files changed, 0 insertions, 0 deletions