From 4ec14ce121df4c33880251a96c2f3e7409eb14fe Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 15 Jun 2015 04:21:40 +0200 Subject: [PATCH] avcodec/jpeg2000dec: Improve readability of SOP check Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000.h | 3 +++ libavcodec/jpeg2000dec.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 6ff0e90923..1054fe6333 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -58,6 +58,9 @@ enum Jpeg2000Markers { JPEG2000_EOC = 0xffd9, // end of codestream }; +#define JPEG2000_SOP_FIXED_BYTES 0xFF910004 +#define JPEG2000_SOP_BYTE_LENGTH 6 + enum Jpeg2000Quantsty { // quantization style JPEG2000_QSTY_NONE, // no quantization JPEG2000_QSTY_SI, // scalar derived diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 5ec929d7b4..8df6168c8c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -812,8 +812,8 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, } } - if (bytestream2_peek_be32(&s->g) == 0xFF910004) - bytestream2_skip(&s->g, 6); + if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES) + bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH); if (!(ret = get_bits(s, 1))) { jpeg2000_flush(s);