1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
FFmpeg/libavformat
Michael Niedermayer 2230d85ceb Merge remote-tracking branch 'qatar/master'
* qatar/master:
  matroskaenc: Allow chapters to be written in trailer

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-05 13:34:37 +02:00
..
2013-06-09 01:10:36 +02:00
2013-06-09 01:10:36 +02:00
2013-09-03 19:34:04 +02:00
2013-07-30 15:29:12 +02:00
2013-07-01 21:37:16 +00:00
2013-06-28 09:04:16 +02:00
2013-05-29 10:40:13 +00:00
2013-08-29 01:57:38 +02:00
2013-06-29 18:02:37 +02:00
2013-09-03 19:34:04 +02:00
2013-06-20 21:49:02 +02:00
2013-07-02 18:52:45 +02:00
2013-09-03 19:34:04 +02:00
2013-06-15 18:50:11 -03:00
2013-07-07 18:50:03 +02:00
2013-08-09 23:02:48 +02:00
2013-07-06 22:27:35 +02:00
2013-08-05 02:53:16 +02:00
2013-08-23 20:05:35 +02:00
2013-08-05 10:14:42 +02:00
2013-08-25 19:44:40 +02:00
2013-06-16 18:56:56 +00:00
2013-08-21 05:51:41 +02:00
2013-05-29 18:14:43 +00:00
2013-06-02 11:25:56 +02:00