summaryrefslogtreecommitdiff
path: root/libavcodec/jpeg2000dec.c
Commit message (Collapse)AuthorAge
* j2kdec & jpeg2000dec: check lengthinc against array sizeMichael Niedermayer2013-05-22
| | | | | | | Fixes out of array reads Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocationMichael Niedermayer2013-05-22
| | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: Port tile size check from j2kdecMichael Niedermayer2013-05-22
| | | | | | Fixes potential integer overflow Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpeg2000dec: check TPsotMichael Niedermayer2013-05-22
| | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpeg2000dec: read and check curtilenoMichael Niedermayer2013-05-22
| | | | | | | | Fixes out of array accesses Code ported from j2kdec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpeg2000dec & j2kdec: Fix return type of get_sot()Michael Niedermayer2013-05-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* vcodec/jpeg2000dec: fix av_log() typeMichael Niedermayer2013-05-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: merge bytestream2 reading from j2kdecMichael Niedermayer2013-05-22
| | | | | | | This fixes at least one out of array access Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000dec: get_qcx, fix stack and heap overwritesMichael Niedermayer2013-05-22
| | | | | | | | | This is likely remotely exploitable Fix ported from j2kdec No uptodate FFmpeg release should be affected by this Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpeg2000dec: Check ncomponents and tile dimensionsMichael Niedermayer2013-05-21
| | | | | | | | | Fixes various problems Code ported from j2kdec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a'Michael Niedermayer2013-05-15
|\ | | | | | | | | | | | | * commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a': jpeg2000dec: don't use deprecated PIX_FMT values Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000dec: don't use deprecated PIX_FMT valuesAnton Khirnov2013-05-15
| |
* | Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'Michael Niedermayer2013-05-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01': fate: update the mmf reference mmf: Write metadata into an Optional Data chunk jpeg2000dec: Use correct printf length modifier for pointer differences Conflicts: libavformat/mmf.c tests/ref/lavf/mmf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000dec: Use correct printf length modifier for pointer differencesDiego Biurrun2013-05-14
| | | | | | | | | | Also eliminate an unnecessary cast. Fixes the following warning: jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’
* | Merge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'Michael Niedermayer2013-05-08
|\| | | | | | | | | | | | | * commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c': jpeg2000dec: initialize static data just once Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000dec: initialize static data just onceJanne Grunau2013-05-06
| |
* | Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'Michael Niedermayer2013-05-08
|\| | | | | | | | | | | | | | | | | | | * commit '45a1694fde251ee56e23aec073d73172c00aa470': jpeg2000dec: cleanup properly after decoding errors Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000dec: cleanup properly after decoding errorsJanne Grunau2013-05-06
| | | | | | | | Fixes memory leak in fate-redcode-demux.
* | jpeg2000dec: fix memleaks in error cases in jpeg2000_decode_frame()Michael Niedermayer2013-05-06
| | | | | | | | | | Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50'Michael Niedermayer2013-05-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '6c5eac9a603a91a707d030d96ba97e2ef6b3ce50': swscale: Remove unnecessary backslashes jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheck Conflicts: libavcodec/jpeg2000dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Fix uninitialized data errors pointed out by valgrind/memcheckNicolas Bertrand2013-05-06
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | jpeg2000: fix for uninitialized data errors in valgrind/memcheckNicolas Bertrand2013-05-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Detect and skip mj2-style jp2c header.Reimar Döffinger2013-05-05
| | | | | | | | | | | | | | | | | | This this fixes one of the issues with http://blogs.bu.edu/mhirsch/files/2012/08/Rotate180CCW-checkerboard.mj2_.zip and at least allows to demux the file properly instead of failing during probing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b'Michael Niedermayer2013-04-24
|\| | | | | | | | | | | | | * commit '2e2d24667a2c5cc7af94cfa7b63bb9ec1c04224b': jpeg2000: Add mutlti-threading support to decoder Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Add mutlti-threading support to decoderNicolas Bertrand2013-04-23
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d'Michael Niedermayer2013-04-23
|\| | | | | | | | | | | | | * commit '10f1a4d9bd8239ac64f364e0d3b6423c28230d6d': jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2kdec: output is native endian AV_PIX_FMT_XYZ12Janne Grunau2013-04-22
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-22
|/ | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Bump minor for JPEG 2000 decoder JPEG 2000 decoder for DCinema The mqc code is merged, the rest is added independent of the existing jpeg2000 decoder and encoder. Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/mqc.c libavcodec/mqc.h libavcodec/mqcdec.c libavcodec/version.h tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
* JPEG 2000 decoder for DCinemaNicolas Bertrand2013-04-22
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> Updated to current programming standards, style and many more small fixes by Diego Biurrun <diego@biurrun.de>. Signed-off-by: Diego Biurrun <diego@biurrun.de>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 06:19:45 +0000