generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

j2kenc: Fix pointer<->integer casts.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-28 15:18:49 +02:00
parent 5a6e7771ed
commit 7393b41744
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/j2kenc.c
View File

@ -330,7 +330,7 @@ static uint8_t *put_sot(J2kEncoderContext *s, int tileno)
uint8_t *psotptr; uint8_t *psotptr;
if (s->buf_end - s->buf < 12) if (s->buf_end - s->buf < 12)
return -1; return NULL;
bytestream_put_be16(&s->buf, J2K_SOT); bytestream_put_be16(&s->buf, J2K_SOT);
bytestream_put_be16(&s->buf, 10); // Lsot 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++){ for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++){
uint8_t *psotptr; uint8_t *psotptr;
if ((psotptr = put_sot(s, tileno)) < 0) if (!(psotptr = put_sot(s, tileno)))
return psotptr; return -1;
if (s->buf_end - s->buf < 2) if (s->buf_end - s->buf < 2)
return -1; return -1;
bytestream_put_be16(&s->buf, J2K_SOD); bytestream_put_be16(&s->buf, J2K_SOD);