diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:37:11 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:37:20 +0100 |
commit | 3eaef560a71f63989f105949accf0d023e92ea07 (patch) | |
tree | 6c50134b43a773e0fc25ac87a943ec6d85404706 /doc/examples/muxing.c | |
parent | caedb041a6ab32038a71d970a79f3d9f04111dff (diff) | |
parent | 51dd54c51aaca909893c9f90a4119e96ff71ffdf (diff) | |
download | ffmpeg-3eaef560a71f63989f105949accf0d023e92ea07.tar.gz |
Merge commit '51dd54c51aaca909893c9f90a4119e96ff71ffdf' into release/0.10
* commit '51dd54c51aaca909893c9f90a4119e96ff71ffdf':
matroskadec: Fix read-after-free in matroska_read_seek()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions