1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavformat
Michael Niedermayer 82e4f39883 Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'
* commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1':
  matroskaenc: write CodecDelay

Conflicts:
	libavformat/matroskaenc.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

This is largely not merged as it causes assertion failures and av sync errors
Further investigation of this is warranted if the changes are found to
fix/improve something in relation to d92b1b1babe69268971863649c225e1747358a74

See: d92b1b1babe69268971863649c225e1747358a74
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 15:56:38 +02:00
..
2014-04-19 16:24:27 +02:00
2014-04-24 18:02:20 +02:00
2014-04-27 14:50:14 +02:00
2014-02-28 00:07:31 +01:00
2014-04-23 21:54:13 +02:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2014-04-01 01:13:09 +02:00
2014-04-14 21:40:59 +02:00
2014-04-05 02:18:09 +02:00
2014-04-22 20:44:31 +02:00
2014-03-11 13:22:49 +01:00
2014-04-27 15:14:32 +02:00
2014-04-20 20:56:02 +02:00
2014-04-23 15:10:42 +02:00
2014-03-04 22:54:13 +01:00
2014-03-08 12:36:57 +01:00
2014-04-15 13:51:48 +02:00