Michael Niedermayer 6fb8684a24 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>

2014-02-10 13:26:31 +01:00

125 KiB

Raw Blame History

View Raw