From 7393b41744a91677283f4e217f3ebe3a399182ab Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 28 Sep 2011 15:18:49 +0200 Subject: [PATCH] j2kenc: Fix pointer<->integer casts. Signed-off-by: Michael Niedermayer --- libavcodec/j2kenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 5a08cb7668..46aa45a674 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -330,7 +330,7 @@ static uint8_t *put_sot(J2kEncoderContext *s, int tileno) uint8_t *psotptr; if (s->buf_end - s->buf < 12) - return -1; + return NULL; bytestream_put_be16(&s->buf, J2K_SOT); bytestream_put_be16(&s->buf, 10); // Lsot @@ -950,8 +950,8 @@ static int encode_frame(AVCodecContext *avctx, for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++){ uint8_t *psotptr; - if ((psotptr = put_sot(s, tileno)) < 0) - return psotptr; + if (!(psotptr = put_sot(s, tileno))) + return -1; if (s->buf_end - s->buf < 2) return -1; bytestream_put_be16(&s->buf, J2K_SOD);