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

avcodec/jpeg2000dec: Improve readability of SOP check

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-15 04:21:40 +02:00
parent 9ba5fe7f3d
commit 4ec14ce121
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/jpeg2000.h
View File

@@ -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

4
libavcodec/jpeg2000dec.c
View File

@@ -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);