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
2014-02-02 12:35:46 +01:00
2014-02-10 12:17:35 +01:00
2013-12-14 21:47:51 +01:00
2014-01-09 12:12:10 +01:00
2014-01-30 15:19:51 +01:00
2013-11-28 10:27:25 +01:00
2013-09-29 16:36:25 +00:00
2013-12-23 12:52:50 +01:00
2014-01-09 12:12:10 +01:00
2013-11-10 02:33:33 +01:00
2013-08-12 03:27:26 +02:00
2014-02-06 02:33:33 +01:00
2014-01-03 17:05:44 +01:00
2013-05-29 11:19:25 +02:00
2013-07-28 14:21:11 +02:00
2013-08-12 03:27:26 +02:00
2013-08-12 03:27:26 +02:00
2014-01-24 12:20:46 +01:00
2014-02-10 13:26:31 +01:00
2014-01-09 12:12:10 +01:00
2013-12-15 10:46:46 +01:00
2013-12-16 19:18:45 +01:00
2014-01-03 17:03:43 +01:00
2013-12-29 22:57:20 +01:00
2013-08-12 19:40:29 +02:00
2014-02-07 09:33:56 +01:00
2014-02-02 13:16:17 +01:00
2014-02-08 19:02:46 +01:00
2013-10-18 23:26:55 +02:00
2013-10-26 11:29:42 +02:00
2013-11-14 09:51:10 +01:00
2013-08-12 03:27:26 +02:00
2014-02-02 11:58:23 +01:00
2013-06-11 01:07:16 +02:00
2013-08-04 14:01:41 +02:00
2014-01-19 13:40:37 +01:00
2014-02-09 17:15:19 +01:00
2013-11-27 13:39:42 +00:00
2013-08-30 15:47:38 +00:00
2014-01-22 00:41:13 +01:00
2013-12-18 09:18:42 -05:00
2013-10-25 15:44:12 +02:00
2013-09-30 16:54:46 +02:00
2013-08-29 22:52:04 +02:00
2013-10-09 04:01:46 +02:00
2014-02-06 16:18:26 +01:00
2013-12-06 10:40:38 +01:00
2013-12-09 21:21:36 +01:00
6fb8684a24