[FFmpeg-cvslog] jpeg2000: merge mant type from j2k

Michael Niedermayer git at videolan.org
Tue May 28 00:43:54 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 27 22:25:03 2013 +0200| [f82e7330af53312c32049131aa96cae6ed1a3c8a] | committer: Michael Niedermayer

jpeg2000: merge mant type from j2k

mant fits in 16bit

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f82e7330af53312c32049131aa96cae6ed1a3c8a
---

 libavcodec/jpeg2000.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h
index 40b7272..22b8927 100644
--- a/libavcodec/jpeg2000.h
+++ b/libavcodec/jpeg2000.h
@@ -144,7 +144,7 @@ typedef struct Jpeg2000CodingStyle {
 
 typedef struct Jpeg2000QuantStyle {
     uint8_t expn[32 * 3];  // quantization exponent
-    uint32_t mant[32 * 3]; // quantization mantissa
+    uint16_t mant[32 * 3]; // quantization mantissa
     uint8_t quantsty;      // quantization style
     uint8_t nguardbits;    // number of guard bits
 } Jpeg2000QuantStyle;



More information about the ffmpeg-cvslog mailing list