[FFmpeg-cvslog] Merge commit 'b36bc81ccaa2fc85dc4bae7dc546c71e8833573d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 10 13:09:13 2014 +0100| [6fb8684a24cd508f63e0246c12aae129614638ea] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6fb8684a24cd508f63e0246c12aae129614638ea
---