diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 13:56:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 13:56:46 +0100 |
| commit | e7d924da30f0bd3cb680f45246526d312d2d2d6f (patch) | |
| tree | 6938925b2a1bd03e539797e75cac2b7686999007 /libavutil/mips/libm_mips.h | |
| parent | 5de1f7a7bd8a69d1cbf4f31816f996c99d545a10 (diff) | |
| parent | 91ac403b1316d59b4f43c4ea0f237e24cec2819a (diff) | |
| download | ffmpeg-e7d924da30f0bd3cb680f45246526d312d2d2d6f.tar.gz | |
Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a'
* commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a':
lavf: fix arithmetic overflows in avformat_seek_file()
mjpeg: initialize input padding after unescaped buffer to zero
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/mips/libm_mips.h')
0 files changed, 0 insertions, 0 deletions