diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 22:15:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-14 22:17:17 +0100 |
| commit | 6659364d3a4778b37421e35c10d9205343f0fa8d (patch) | |
| tree | 41fd955f6d2c6b6dee7ce660313b8f6dd9d923c4 /libavfilter/unsharp.h | |
| parent | f357ef2e0ce189955f1a7681ae658432efeb17b3 (diff) | |
| parent | 797f2a791397210ec1b591b326658805c5dbf104 (diff) | |
| download | ffmpeg-6659364d3a4778b37421e35c10d9205343f0fa8d.tar.gz | |
Merge commit '797f2a791397210ec1b591b326658805c5dbf104'
* commit '797f2a791397210ec1b591b326658805c5dbf104':
hdsenc: Check the init_file() return code
hdsenc: Fix an off by one error in an array size check
hdsenc: Avoid integer overflow
Conflicts:
libavformat/hdsenc.c
See: 572965c9a6b8173d918dea392aadfee1d44d7f47
See: 3dbf9afe857d480993786bea0ede9dd9526776d2
See: 6722e564a82bac471d92b02550b5017c09b539ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/unsharp.h')
0 files changed, 0 insertions, 0 deletions