summaryrefslogtreecommitdiffstats
path: root/libavcodec/dds.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/dds: Fix runtime error: left shift of 145 by 24 places cannot be ↵Michael Niedermayer2017-05-291-1/+1
| | | | | | | | | represented in type 'int' Fixes: 1891/clusterfuzz-testcase-minimized-6274417925554176 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dds: Fix runtime error: left shift of 210 by 24 places cannot be ↵Michael Niedermayer2017-05-131-1/+1
| | | | | | | | | represented in type 'int' Fixes: 1510/clusterfuzz-testcase-minimized-5826231746428928 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/dds: Fix runtime error: left shift of 1 by 31 places cannot be ↵Michael Niedermayer2017-05-061-1/+1
| | | | | | | | | represented in type 'int' Fixes: 1380/clusterfuzz-testcase-minimized-650122545122508 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc: fix usages of av_get_codec_tag_string()Clément Bœsch2017-03-291-8/+4
|
* dds: limit 4 bpp handling to AV_PIX_FMT_PAL8Andreas Cadhalpun2016-11-161-1/+1
| | | | | | | | | | | This fixes NULL pointer dereferencing for formats, where frame->data[1] is not allocated. The problem was introduced in commit 257fbc3af4cba08ac471dab68924182160bde6fd. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avcodec/dds: add support for 4bpp formatPaul B Mahol2016-09-211-2/+36
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'Clément Bœsch2016-06-211-0/+4
|\ | | | | | | | | | | | | * commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869': dds: Add support for monochrome images Merged-by: Clément Bœsch <clement@stupeflix.com>
| * dds: Add support for monochrome imagesVittorio Giovara2016-04-261-0/+4
| |
| * dds: Drop gray-alpha swappingVittorio Giovara2016-04-261-12/+0
| | | | | | | | The original sample was generated with invalid software.
* | Merge commit '22e49e6edead9c83696f20127988f659b952ce65'Derek Buitenhuis2016-05-081-5/+1
|\ \ | |/ | | | | | | | | | | * commit '22e49e6edead9c83696f20127988f659b952ce65': dds: Simplify postprocessing check Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dds: Simplify postprocessing checkVittorio Giovara2016-04-061-3/+1
| |
* | Merge commit '02538636261fdec9c70f4185b23147c636f269b4'Derek Buitenhuis2016-05-081-0/+2
|\ \ | |/ | | | | | | | | | | * commit '02538636261fdec9c70f4185b23147c636f269b4': dds: Add support for alpha-only files Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dds: Add support for alpha-only filesVittorio Giovara2016-04-061-0/+2
| | | | | | | | | | | | | | Due to how pixel format conversion is done, they behave the same way as gray files. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'Derek Buitenhuis2016-05-081-0/+4
|\ \ | |/ | | | | | | | | | | * commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc': dds: Add support for rgb555 files Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * dds: Add support for rgb555 filesVittorio Giovara2016-04-061-0/+4
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * dds: disable palette flag for compressed imagesAndreas Cadhalpun2015-11-141-0/+6
| | | | | | | | | | | | | | | | Having both is not valid and can cause a NULL pointer dereference of frame->data[1] later. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * dds: add missing newline to log messagesAndreas Cadhalpun2015-11-121-2/+2
| | | | | | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| * dds: validate compressed source buffer sizeAndreas Cadhalpun2015-11-121-0/+9
| | | | | | | | | | | | | | A too small buffer will cause segfaults somewhere below decompress_texture_thread. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| * dds: validate source buffer size before copyingAndreas Cadhalpun2015-11-121-0/+6
| | | | | | | | | | | | If it is too small av_image_copy_plane segfaults. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | lavc/dds: Fix GRAY8A decoding.Carl Eugen Hoyos2016-04-151-2/+4
| | | | | | | | Fixes ticket #4667.
* | lavc/dds: replace rint by lrintGanesh Ajjanagadde2015-12-261-1/+2
| | | | | | | | | | | | avoids float to int cast. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
* | dds: disable palette flag for compressed ddsAndreas Cadhalpun2015-11-141-0/+6
| | | | | | | | | | | | | | | | Having both is not valid and can cause a NULL pointer dereference of frame->data[1] later. Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | dds: add missing newline to log messagesAndreas Cadhalpun2015-11-111-2/+2
| | | | | | | | | | Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | dds: validate compressed source buffer sizeAndreas Cadhalpun2015-11-111-0/+9
| | | | | | | | | | | | | | | | A too small buffer will cause segfaults somewhere below decompress_texture_thread. Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | dds: validate source buffer size before copyingAndreas Cadhalpun2015-11-111-0/+6
| | | | | | | | | | | | | | If it is too small av_image_copy_plane segfaults. Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.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>
| * dds: Write the palette in the native endian formMartin Storsjö2015-07-231-5/+7
| | | | | | | | | | | | | | This fixes the palette on big endian, broken (or, differing from little endian) since 57214b2f7. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360'Michael Niedermayer2015-07-231-9/+17
|\ \ | |/ | | | | | | | | | | * commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360': dds: Fix the slice size computation Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dds: Fix the slice size computationTom Butterworth2015-07-231-9/+17
| | | | | | | | | | | | | | | | A bug was introduced in 6b2b26e7af3ede0abfb46eb5725c26d1083f50bc whereby when frame height wasn't divisible by the number of threads, pixels would be omitted from the bottom rows during decode. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * dds: Fix 32bpp bitmaps decodingMichael Niedermayer2015-07-221-5/+7
| | | | | | | | | | Found-By: ami_stuff Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * dds: Fix palette decodingVittorio Giovara2015-07-221-3/+7
| | | | | | | | | | | | Red and blue channels were decoded in the wrong order. Found-By: ami_stuff
* | Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'Michael Niedermayer2015-07-221-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'ea4d46e72945cba37feb7aa154eb970732f513e4': dds: Fix enum declaration Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dds: Fix enum declarationVittorio Giovara2015-07-221-2/+2
| | | | | | | | Drop the global variables with anonymous enum type.
* | Merge commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc'Michael Niedermayer2015-07-211-9/+27
|\ \ | |/ | | | | | | | | | | * commit '6b2b26e7af3ede0abfb46eb5725c26d1083f50bc': dds: Decode using optimal slices sizes Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * dds: Decode using optimal slices sizesLuca Barbato2015-07-211-9/+27
| | | | | | | | | | | | | | Enjoy some cache locality and use less threads. About the same speedup provided to HAP. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * dds: Fix palette mode on big endianLuca Barbato2015-06-241-1/+6
| | | | | | | | | | Found-By: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/dds: Flip more R<->B casesMichael Niedermayer2015-07-201-5/+9
| | | | | | | | | | | | Fixes Ticket4665 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dds: fix paletted filesMichael Niedermayer2015-07-191-3/+7
| | | | | | | | | | | | | | | | | | Fixes Ticket4664 The changed fate tests lack red/blue shades and thus look correct either way Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dds: Fix palettes on big endianMichael Niedermayer2015-06-221-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'Michael Niedermayer2015-06-221-4/+4
|/ | | | | | | | | | | | | | | * commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2': DirectDraw Surface image decoder Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/version.h tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* DirectDraw Surface image decoderVittorio Giovara2015-06-221-0/+660
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
OpenPOWER on IntegriCloud