[FFmpeg-cvslog] Merge commit 'a1aa37dd0b96710d4a17718198a3f56aea2040c1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 15:02:44 2014 +0200| [82e4f39883932c1b1e5c7792a1be12dec6ab603d] | committer: Michael Niedermayer

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

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