diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 04:27:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 04:29:40 +0200 |
| commit | 8bf90562f6cb0f723d5935de1eb4c785037807f9 (patch) | |
| tree | d42af402601cfcb5cc45a4a284999ff79002f110 /libavfilter/vf_subtitles.c | |
| parent | feaa31d35499395ec292015ce02e2a5494c8283e (diff) | |
| parent | eb3b5501e8b85bfea09d533314cb6920efc42639 (diff) | |
| download | ffmpeg-8bf90562f6cb0f723d5935de1eb4c785037807f9.tar.gz | |
Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639'
* commit 'eb3b5501e8b85bfea09d533314cb6920efc42639':
matroskadec: read the CodecDelay element
Conflicts:
libavformat/matroska.h
libavformat/matroskadec.c
See: d6f86d74edfa6e1464ddc613726559269bf1dc7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_subtitles.c')
0 files changed, 0 insertions, 0 deletions