[FFmpeg-cvslog] Merge commit '82cebc0e0544dce507749dd9b1c2983f083de836' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May  4 21:01:38 2014 +0200| [c36fd16aaa0bf67b2af254ef8324dc8d8ee9fca7] | committer: Michael Niedermayer

Merge commit '82cebc0e0544dce507749dd9b1c2983f083de836' into release/2.2

* commit '82cebc0e0544dce507749dd9b1c2983f083de836':
  matroskadec: read the CodecDelay element

Conflicts:
	libavformat/matroska.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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