1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

jpeg2000dec: merge struct field types from j2k

Fixes AVOption type mismatch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-31 01:47:22 +02:00
parent 89f472b3ee
commit 5dbbb762e5

View File

@ -80,12 +80,13 @@ typedef struct Jpeg2000DecoderContext {
int bit_index;
int16_t curtileno;
int curtileno;
Jpeg2000Tile *tile;
/*options parameters*/
int16_t lowres;
int16_t reduction_factor;
int lowres;
int reduction_factor;
} Jpeg2000DecoderContext;
/* get_bits functions for JPEG2000 packet bitstream