summaryrefslogtreecommitdiff
path: root/libavcodec/tiff.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/tiff: Fix leak of geotags[].valMichael Niedermayer2017-06-181-0/+2
| | | | | | | | | Fixes: 2176/clusterfuzz-testcase-minimized-5908197216878592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 22a25ab3896cbb8dceebdba4d439e8b2b398ff0e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: Avoid loosing allocated geotag valuesMichael Niedermayer2017-06-181-0/+2
| | | | | | | | | | Fixes memleak Fixes: 2076/clusterfuzz-testcase-minimized-6542640243802112 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d7cbeab4c1381f95ed0ebf85d7950bee96f66164) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: reset sampling[] if its invalidMichael Niedermayer2017-05-161-0/+1
| | | | | | | | | | Fixes divission by 0 Fixes: clusterfuzz-testcase-minimized-5592896440893440 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f08122fbe039a56ab3c24f74636b4b0efea97d85) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: Perform multiply in tiff_unpack_lzma() as 64bitMichael Niedermayer2017-05-161-1/+1
| | | | | | | | | | | This should make no difference as the value should not be able to be that large but its more correct this way Fixes CID1348138 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f48b6b8b91d63148ef50d096688ed7226cd6ddf4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: Check geotag count for being non zeroMichael Niedermayer2017-05-161-1/+2
| | | | | | | | | | Fixes memleak Fixes: 874/clusterfuzz-testcase-5252796175613952 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3182e19c1c29eef60208a67ad8ecad1d9a2d0694) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: Check stripsize strippos for overflowMichael Niedermayer2017-05-161-0/+10
| | | | | | | | | Fixes: 861/clusterfuzz-testcase-5688284384591872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 5d996b56499f00f80b02a41bab3d6b7349e36e9d) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: Check for multiple geo key directoriesMichael Niedermayer2017-05-161-0/+4
| | | | | | | | | | Fixes memleak Fixes: 826/clusterfuzz-testcase-5316921379520512 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 108b02e5471c1dae248200db694aba9b7b8555a8) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: Check subsample & rps values more completelyMichael Niedermayer2016-01-181-2/+7
| | | | | | | | Fixes out of array access Fixes: 83aedfb29af669c4d6e10f1bfad974d2/asan_heap-oob_1ab42fe_4984_9f6ec14462f8d8a00ea24b320572a963.tif Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: Support uncompressed G3 CCITT faxMichael Niedermayer2015-08-131-5/+1
| | | | | | Fixes part of Ticket700 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tiff: Support uncompressed G4 CCITT faxMichael Niedermayer2015-08-131-1/+1
| | | | | | Fixes part of ticket700 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-271-2/+2
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/tiff: move bpp check to after "end:"Michael Niedermayer2015-03-081-7/+7
| | | | | | | | | | | | This ensures that all current and future code-pathes get bpp checked Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186'Michael Niedermayer2015-03-081-0/+8
|\ \ | |/ | | | | | | | | | | | | * commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186': tiff: Check that there is no aliasing in pixel format selection See: e1c0cfaa419aa5d320540d5a1b3f8fd9b82ab7e5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: Check that there is no aliasing in pixel format selectionAnton Khirnov2015-03-081-0/+8
| | | | | | | | | | | | | | | | | | Fixes possible issues with unexpected bpp/bppcount values. CC: libav-stable@libav.org Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Bug-Id: CVE-2014-8544 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Respect horizontal differencing predictor for 16bit gray tiff images.Carl Eugen Hoyos2015-01-301-0/+4
| | | | | | | | Fixes ticket #4291.
* | Merge commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2'Michael Niedermayer2015-01-151-62/+62
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'f86f39cb9b1fcd063d5e4812132a75c06cc7acd2': tiff: support decoding GBRP and GBRAP formats Conflicts: libavcodec/tiff.c See: 379ad9788b80e05c0379adc49b26704dfd27d564 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: support decoding GBRP and GBRAP formatsPaul B Mahol2015-01-141-57/+81
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * tiff: support encoding and decoding 64bit imagesCarl Eugen Hoyos2014-12-181-2/+7
| |
* | libavcodec/tiff: Fix static linking of lzma with msvc.Matthew Oliver2014-11-221-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: more completely check bpp/bppcountMichael Niedermayer2014-10-031-3/+10
| | | | | | | | | | | | | | | | | | Fixes pixel format selection Fixes out of array accesses Fixes: asan_heap-oob_1766029_6_asan_heap-oob_20aa045_332_cov_1823216757_m2-d1d366d7965db766c19a66c7a2ccbb6b.tif Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: fix odd dimensioned yuvMichael Niedermayer2014-09-151-1/+3
| | | | | | | | | | | | Fixes Ticket3893 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: fix {2,4}bpp grayscale palettes.Benoit Fouet2014-09-051-1/+15
| | | | | | | | | | | | | | | | Create a default grayscale palette for 2 or 4 bpp grayscale tiff, if there is no palette defined. Fixes ticket #3915 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: Make pixel format checks tighterMichael Niedermayer2014-08-241-2/+6
| | | | | | | | | | | | Fixes assertion failure with imgsrc001-lzma.tiff Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/tiff: add support for LZMA compressionJames Almer2014-08-241-2/+83
| | | | | | | | | | | | | | | | Derived from deflate code. Requires liblzma. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/tiff: add support for YUV deflateJames Almer2014-08-191-8/+9
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | lavc/tiff: move unpack_yuv() above the deflate functionsJames Almer2014-08-191-29/+28
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/tiff: Check that pix_fmt is a yuv variant for TIFF_PHOTOMETRIC_YCBCRMichael Niedermayer2014-08-191-0/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: do not use photometric to detect pix_fmtMichael Niedermayer2014-08-191-1/+2
| | | | | | | | | | | | | | | | They should match but they do not always Fixes assertion failure no testcase with unmodified source available Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0'Michael Niedermayer2014-08-181-0/+3
|\ \ | |/ | | | | | | | | | | * commit '12640e4cbb142be0cd025bcf37f1ea437bdfecd0': tiff: Return proper error for missing LZMA compression Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: Return proper error for missing LZMA compressionDiego Elio Pettenò2014-08-181-0/+3
| | | | | | | | | | | | | | | | The LZMA support is a semi-official extension supported by libtiff 4.0.0 and later. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86'Michael Niedermayer2014-08-101-11/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86': tiff: Improve grayscale support Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: Improve grayscale supportDiego Elio Pettenò2014-08-101-11/+3
| | | | | | | | | | | | | | | | | | | | Only use PAL8 if palette is present, else use GRAY8 for pixfmt. Instead of simulating a grayscale palette, use real grayscale pixels, if no palette is actually defined. Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '60cbd6ad84de0931314030b81df87b69d6196587'Michael Niedermayer2014-08-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '60cbd6ad84de0931314030b81df87b69d6196587': tiff: support reading gray+alpha at 8 bits Conflicts: libavcodec/tiff.c See: f746f3790168bf898b629942868bda703e7f1045 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: support reading gray+alpha at 8 bitsCarl Eugen Hoyos2014-08-041-0/+3
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab'Michael Niedermayer2014-08-041-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'bcc5f69b33e27b5e11aaea8304ee02f8d895cdab': tiff: support reading gray+alpha at 16 bits Conflicts: libavcodec/tiff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiff: support reading gray+alpha at 16 bitsVittorio Giovara2014-08-041-0/+3
| |
| * tiff: Replace deprecated PIX_FMT names by modern onesDiego Biurrun2014-08-021-2/+2
| |
| * Revert "tiff: support reading gray+alpha at 8 bits"Janne Grunau2014-07-211-3/+0
| | | | | | | | | | This reverts commit b31d76e45fc3c6529dd7109e721676f3ec376d00 as it uses an unkown pixel format.
| * tiff: support reading gray+alpha at 8 bitsCarl Eugen Hoyos2014-07-201-0/+3
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * tiffdec: support predictor type 2 with RGB48 pixel formatJean First2014-04-121-4/+18
| |
* | avcodec/tiff: Support 410 and 440 YCbCrMichael Niedermayer2014-04-301-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: support 4:2:2 and 4:1:1 YCbCrMichael Niedermayer2014-04-291-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: Support yuv 420 and 444Michael Niedermayer2014-04-271-6/+82
| | | | | | | | | | | | Fixes Ticket416 Trolled-by: jb Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: parse subsample factorsMichael Niedermayer2014-04-271-0/+11
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: use av_malloc(z)_array()Michael Niedermayer2014-04-201-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/exif/exif_add_metadata: add support for SSHORT & SBYTEMichael Niedermayer2014-04-201-1/+1
| | | | | | | | | | | | | | | | No working testcase, this omission was just spoted when the parser apparently went out of sync. Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tiff: remove unused variablesMichael Niedermayer2014-04-131-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status