Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 12:09:13 +0000 (13:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 12:26:31 +0000 (13:26 +0100)
commit6fb8684a24cd508f63e0246c12aae129614638ea
tree1166d5457158746ba53181016cdebbc2d4e06ab7
parent6421111b52de4442768e7ef31b4d29055f83900c
parentb36bc81ccaa2fc85dc4bae7dc546c71e8833573d
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>
doc/ffplay.texi
ffplay.c