diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 13:09:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 13:26:31 +0100 |
| commit | 6fb8684a24cd508f63e0246c12aae129614638ea (patch) | |
| tree | 1166d5457158746ba53181016cdebbc2d4e06ab7 /libavdevice/sndio_enc.c | |
| parent | 6421111b52de4442768e7ef31b4d29055f83900c (diff) | |
| parent | b36bc81ccaa2fc85dc4bae7dc546c71e8833573d (diff) | |
| download | ffmpeg-6fb8684a24cd508f63e0246c12aae129614638ea.tar.gz | |
Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'
* commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d':
avplay: add support for seeking to chapter marks
Conflicts:
doc/ffplay.texi
ffplay.c
ffplay uses pageup/down for seeking by +-10min
thus this use of the keys conflicts.
The merge thus uses them to seek to chapters when there are some or
+-10min when there are not
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/sndio_enc.c')
0 files changed, 0 insertions, 0 deletions