Commit Graph

12 Commits

Author SHA1 Message Date
Michael Niedermayer
5b4cad4a64 j2k.h: remove disabled debug code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:49 +02:00
Michael Niedermayer
ad194874ee j2k.h: Merges various cosmetics & unused defines
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
da90661718 j2k/jpeg2000: merge copyright
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
e66faf71eb j2k: merge ff_j2k_init_tier1_luts()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
69b9773980 j2k: s/getnbctxno/getsigctxno/g
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
5157ec89ef j2k: redesign vert_causal_ctx_csty implementation
The old implementation was incomplete and could not have worked
This also fixes some warnings
New code is untested as i dont seem to have a sample file that uses this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 18:07:48 +02:00
Michael Niedermayer
d42106c3ac j2k: rename a few inline functions and data tables to match jpeg2000
also inlcudes some other cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 14:02:44 +02:00
Michael Niedermayer
81be0965e3 j2k: merge Jpeg2000CodingStyle from jpeg2000
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26 13:57:56 +02:00
Michael Niedermayer
78c7bff04a avcodec/j2k: rename J2K_ constants to JPEG2000_
This should simplify merging the 2 decoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Michael Niedermayer
0ab0ed2b86 j2k: Rename structs to be more similar to jpeg2000dec
This should simplify merging

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 21:44:34 +02:00
Rukhsana Ruby
88e9397ef1 j2k[c/h] j2kdec.c: Implement 2 code block styles 2011-05-24 01:31:54 +02:00
Kamil Nowosad
83654c7b1b Add Kamil Nowosads j2k code.
This needs work but it should not rot in soc svn.
2011-05-24 01:31:53 +02:00