1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
Michael Niedermayer d302853bca Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'
* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
  matroskaenc: Validate chapter start and end times

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-17 20:25:47 +01:00
..
2014-12-18 00:10:35 +01:00
2015-02-16 19:59:04 +01:00
2015-01-15 17:09:39 +01:00
2015-01-30 09:33:49 +00:00
2015-02-06 20:44:36 +01:00
2014-12-18 23:27:07 +01:00
2015-02-15 18:20:54 +01:00
2014-12-18 00:10:35 +01:00
2014-12-20 00:17:43 +01:00
2014-12-18 23:11:37 +02:00
2015-01-18 00:36:56 +01:00
2015-02-04 13:10:53 +00:00
2015-02-01 20:00:10 +01:00
2015-01-11 00:35:01 +01:00
2015-01-11 00:35:01 +01:00