Merge commit '82cebc0e0544dce507749dd9b1c2983f083de836' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 19:01:38 +0000 (21:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 19:01:38 +0000 (21:01 +0200)
commitc36fd16aaa0bf67b2af254ef8324dc8d8ee9fca7
treebdf26777cde02f7b770ad5d5a3ada936ce50ed73
parent8c5897632a326c1d797f0bd45f97e0c83683412c
parent82cebc0e0544dce507749dd9b1c2983f083de836
Merge commit '82cebc0e0544dce507749dd9b1c2983f083de836' into release/2.2

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

Conflicts:
libavformat/matroska.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskadec.c