diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-06-08 16:38:37 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-06-08 16:38:37 +0200 |
| commit | 9e4cb03a93593f8ddb8b4ea3c7ee3bf8acb7ea21 (patch) | |
| tree | 49724543ae4ba41977c593bacb423618b743a01a /libavcodec | |
| parent | d552f616a26623e5b593e4d3474c61563f3939fd (diff) | |
| download | ffmpeg-9e4cb03a93593f8ddb8b4ea3c7ee3bf8acb7ea21.tar.gz | |
Fix "mixed declarations and code" warnings.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/j2kdec.c | 5 | ||||
| -rw-r--r-- | libavcodec/qtrleenc.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 2497a2e015..73af6a73df 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -692,6 +692,8 @@ static int decode_cblk(J2kDecoderContext *s, J2kCodingStyle *codsty, J2kT1Contex int width, int height, int bandpos) { int passno = cblk->npasses, pass_t = 2, bpno = cblk->nonzerobits - 1, y, clnpass_cnt = 0; + int bpass_csty_symbol = J2K_CBLK_BYPASS & codsty->cblk_style; + int vert_causal_ctx_csty_symbol = J2K_CBLK_VSC & codsty->cblk_style; for (y = 0; y < height+2; y++) memset(t1->flags[y], 0, (width+2)*sizeof(int)); @@ -703,9 +705,6 @@ static int decode_cblk(J2kDecoderContext *s, J2kCodingStyle *codsty, J2kT1Contex cblk->data[cblk->length] = 0xff; cblk->data[cblk->length+1] = 0xff; - int bpass_csty_symbol = J2K_CBLK_BYPASS & codsty->cblk_style; - int vert_causal_ctx_csty_symbol = J2K_CBLK_VSC & codsty->cblk_style; - while(passno--){ switch(pass_t){ case 0: decode_sigpass(t1, width, height, bpno+1, bandpos, diff --git a/libavcodec/qtrleenc.c b/libavcodec/qtrleenc.c index d43ff7b06b..6258b143ad 100644 --- a/libavcodec/qtrleenc.c +++ b/libavcodec/qtrleenc.c @@ -231,10 +231,11 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t else if (rlecode > 0) { /* bulk copy */ if (s->avctx->pix_fmt == PIX_FMT_GRAY8) { + int j; // QT grayscale colorspace has 0=white and 255=black, we will // ignore the palette that is included in the AVFrame because // PIX_FMT_GRAY8 has defined color mapping - for (int j = 0; j < rlecode*s->pixel_size; ++j) + for (j = 0; j < rlecode*s->pixel_size; ++j) bytestream_put_byte(buf, *(this_line + i*s->pixel_size + j) ^ 0xff); } else { bytestream_put_buffer(buf, this_line + i*s->pixel_size, rlecode*s->pixel_size); @@ -244,8 +245,9 @@ static void qtrle_encode_line(QtrleEncContext *s, AVFrame *p, int line, uint8_t else { /* repeat the bits */ if (s->avctx->pix_fmt == PIX_FMT_GRAY8) { + int j; // QT grayscale colorspace has 0=white and 255=black, ... - for (int j = 0; j < s->pixel_size; ++j) + for (j = 0; j < s->pixel_size; ++j) bytestream_put_byte(buf, *(this_line + i*s->pixel_size + j) ^ 0xff); } else { bytestream_put_buffer(buf, this_line + i*s->pixel_size, s->pixel_size); |