[FFmpeg-cvslog] jpeg2000dec: merge sgnd fix from j2k

Michael Niedermayer git at videolan.org
Fri May 31 03:11:47 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 31 01:49:31 2013 +0200| [192050d7a7d57ae289a72c39710048e481c52337] | committer: Michael Niedermayer

jpeg2000dec: merge sgnd fix from j2k

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

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

 libavcodec/jpeg2000dec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index e70b5ce..abd93ef 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -185,7 +185,7 @@ static int get_siz(Jpeg2000DecoderContext *s)
         uint8_t x = bytestream2_get_byteu(&s->g);
         s->cbps[i]   = (x & 0x7f) + 1;
         s->precision = FFMAX(s->cbps[i], s->precision);
-        s->sgnd[i]   = (x & 0x80) == 1;
+        s->sgnd[i] = !!(x & 0x80);
         s->cdx[i]    = bytestream2_get_byteu(&s->g);
         s->cdy[i]    = bytestream2_get_byteu(&s->g);
     }



More information about the ffmpeg-cvslog mailing list