summaryrefslogtreecommitdiff
path: root/libavcodec/jpeg2000.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'be3271009ef893fbed9640e8edbd771685fd957b'Michael Niedermayer2013-07-031-3/+5
|\ | | | | | | | | | | | | | | | | | | * commit 'be3271009ef893fbed9640e8edbd771685fd957b': jpeg2000: Define the maximum decomposition levels Conflicts: libavcodec/jpeg2000.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpeg2000: Define the maximum decomposition levelsLuca Barbato2013-07-021-3/+5
| | | | | | | | | | | | And define the resolution levels according. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | jpeg2000: Make nreslevel fields intMichael Niedermayer2013-06-051-2/+2
| | | | | | | | | | | | This prevents potential integer overflows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000/j2k: merge j2k/jpeg2000.c/hMichael Niedermayer2013-05-301-0/+2
| | | | | | | | | | | | Now only j2kdec / jpeg2000dec.c remain Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: split data pointer in int & float.Michael Niedermayer2013-05-301-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a TODO item and unifies both decoders structures It also fixes undefined behavior due to aliasing violations I choose 2 fields instead of a union because mistakely using the wrong type with a union will lead to hard to debug "wrong output" while with 2 fields mistakely using the wrong type will crash with a null pointer derefernce which is much easier to debug Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: split stepsize in float & int variablesMichael Niedermayer2013-05-281-3/+2
| | | | | | | | | | | | This is more clear and less prone to mistakes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | jpeg2000: merge mant type from j2kMichael Niedermayer2013-05-271-1/+1
| | | | | | | | | | | | mant fits in 16bit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: drop xi/yi0/1 from Jpeg2000PrecMichael Niedermayer2013-05-271-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000 headers: Cblk/Prec cleanup & mergeMichael Niedermayer2013-05-271-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | j2k/jpeg2000: log2_prec size cleanupMichael Niedermayer2013-05-261-2/+0
| | | | | | | | | | | | This also changes the cblk size storage method to what jpeg2000 uses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-04-221-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | * 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-221-0/+268
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>
View Lorry Controller Status