diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:45:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-03 15:45:03 +0200 |
| commit | ee7da5baccc3e038179c4072e9bab00b5689c1a9 (patch) | |
| tree | ca7e82effbf112f838e5bd959cccd0dbc67becd7 /libavcodec | |
| parent | 44741113257b8f5e21f4676894d3ff9b9e5f99ac (diff) | |
| parent | 589e5b52f634f6b2d307a167a19eef7e7328cb08 (diff) | |
| download | ffmpeg-ee7da5baccc3e038179c4072e9bab00b5689c1a9.tar.gz | |
Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'
* commit '589e5b52f634f6b2d307a167a19eef7e7328cb08':
jpeg2000: Use the correct sizeof in memset for T1 data
jpeg2000: Simplify init_tile()
jpeg2000: Update pixel format support
Conflicts:
libavcodec/jpeg2000dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index f45e609c20..711b298d3f 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -242,7 +242,7 @@ static int get_siz(Jpeg2000DecoderContext *s) s->avctx->height = ff_jpeg2000_ceildivpow2(s->height - s->image_offset_y, s->reduction_factor); - switch(s->ncomponents) { + switch (s->ncomponents) { case 1: if (s->precision > 8) s->avctx->pix_fmt = AV_PIX_FMT_GRAY16; @@ -940,8 +940,8 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty, if (!cblk->length) return 0; - for (y = 0; y < height+2; y++) - memset(t1->flags[y], 0, (width + 2)*sizeof(**t1->flags)); + for (y = 0; y < height + 2; y++) + memset(t1->flags[y], 0, (width + 2) * sizeof(**t1->flags)); cblk->data[cblk->length] = 0xff; cblk->data[cblk->length+1] = 0xff; |