diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 03:45:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 03:47:15 +0200 |
| commit | 27801500eed36a19adc89a395e45085ddb9d8969 (patch) | |
| tree | 13bed8d8e97c934237b1a015e648938ebc4a1eeb /libavutil/lls.h | |
| parent | 77010a41fef047bff53536387db7fa043495bb6c (diff) | |
| parent | 3919a4572690894d0a7ad4170d699c52b4748194 (diff) | |
| download | ffmpeg-27801500eed36a19adc89a395e45085ddb9d8969.tar.gz | |
Merge commit '3919a4572690894d0a7ad4170d699c52b4748194'
* commit '3919a4572690894d0a7ad4170d699c52b4748194':
jpeglsenc: Check memory allocations
Conflicts:
libavcodec/jpeglsenc.c
See: 48214956b2f115e9cadfcdf1ff06a2477c87a295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/lls.h')
0 files changed, 0 insertions, 0 deletions