diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 23:23:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-05 23:32:40 +0100 |
| commit | 95f719fb8f475523d29f93a7e321a6db9f837631 (patch) | |
| tree | 56ed1b3476d31c3650a0ec7e77ea0bed98ad47f8 /libavutil/des.h | |
| parent | fa4c3130ee1f3f9e2b86a14feaa11e720747bdf3 (diff) | |
| parent | 69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff (diff) | |
| download | ffmpeg-95f719fb8f475523d29f93a7e321a6db9f837631.tar.gz | |
Merge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'
* commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff':
mkv: Validate ASS Start and End fields
Conflicts:
libavformat/matroskaenc.c
No change as the changed code is not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/des.h')
0 files changed, 0 insertions, 0 deletions