diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-15 23:10:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-15 23:10:26 +0200 |
| commit | 62101030c4ff23c61046a70cd27a627dfb0e0e54 (patch) | |
| tree | 8837cb836ad73deea83be440cc8d315ba2f601ce /libavfilter/af_aformat.c | |
| parent | e78d1a594a0a4942b2c39170df10b9f36f9b8d08 (diff) | |
| parent | ea540401d6082474df8364169e2041e29e4dc407 (diff) | |
| download | ffmpeg-62101030c4ff23c61046a70cd27a627dfb0e0e54.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: fix byte overreads in SSE-optimized hscale().
matroskadec: fix typo.
matroskadec: bail on parsing of incorrect seek index segments
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_aformat.c')
0 files changed, 0 insertions, 0 deletions