diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 20:25:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 20:25:47 +0100 |
| commit | d302853bcabf47c53c47abb4714d5bc7c01f0b0b (patch) | |
| tree | 45b3c53101a641a8b1ece6995183090c71c2b1c7 /libavfilter/x86/Makefile | |
| parent | d2668ae472690fe102b7c63fbddd716ebca25dd3 (diff) | |
| parent | 5dc47a2bd52e375ed742c45d08356b45098f458d (diff) | |
| download | ffmpeg-d302853bcabf47c53c47abb4714d5bc7c01f0b0b.tar.gz | |
Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'
* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
matroskaenc: Validate chapter start and end times
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86/Makefile')
0 files changed, 0 insertions, 0 deletions