diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:01:38 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:01:38 +0400 |
| commit | c36fd16aaa0bf67b2af254ef8324dc8d8ee9fca7 (patch) | |
| tree | bdf26777cde02f7b770ad5d5a3ada936ce50ed73 /libavformat/matroska.c | |
| parent | 8c5897632a326c1d797f0bd45f97e0c83683412c (diff) | |
| parent | 82cebc0e0544dce507749dd9b1c2983f083de836 (diff) | |
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>
Diffstat (limited to 'libavformat/matroska.c')
0 files changed, 0 insertions, 0 deletions