diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 22:00:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-15 22:00:52 +0100 |
| commit | 07b4d4b1a282d1968e0977bc34ed303ea26b1246 (patch) | |
| tree | dc25f9b24bff4cb033ba5aac13f1cb44dca62a1c /ffmpeg.c | |
| parent | 41915d0b86c60a46c1dc8151672770b7cddbe18f (diff) | |
| parent | 3c27275c1309190f2d6ed69140b67d014215b6c9 (diff) | |
| download | ffmpeg-07b4d4b1a282d1968e0977bc34ed303ea26b1246.tar.gz | |
Merge commit '3c27275c1309190f2d6ed69140b67d014215b6c9'
* commit '3c27275c1309190f2d6ed69140b67d014215b6c9':
tiff: Check the check_size() return value and forward it
Conflicts:
libavcodec/tiffenc.c
See: d50aa006fb3430bedc3872ba10e028a714499625
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions