diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 19:28:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 19:29:50 +0100 |
| commit | e5b878b37f64e443847dd7655d6c2068eb37e130 (patch) | |
| tree | c4894923b3d9d4459778ec1a7ef39eb295efbd71 /libswresample | |
| parent | d5b20daeb0e311caa62a899d41c8823c605d117a (diff) | |
| parent | a9602c6cfbe6fa06ff97ad01c0ffa9ad5ccff30f (diff) | |
| download | ffmpeg-e5b878b37f64e443847dd7655d6c2068eb37e130.tar.gz | |
Merge commit 'a9602c6cfbe6fa06ff97ad01c0ffa9ad5ccff30f' into release/2.2
* commit 'a9602c6cfbe6fa06ff97ad01c0ffa9ad5ccff30f':
matroskadec: Fix read-after-free in matroska_read_seek()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions