diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 01:47:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-31 03:10:07 +0200 |
| commit | 5dbbb762e58c8c410cfdfbb25d89f8b8314164e7 (patch) | |
| tree | 8724bac591792bf6c6d03b380d6f3e951d5696aa /libavcodec/jpeg2000dec.c | |
| parent | 89f472b3ee2f4af6cbae01b18042505a1d2b094a (diff) | |
| download | ffmpeg-5dbbb762e58c8c410cfdfbb25d89f8b8314164e7.tar.gz | |
jpeg2000dec: merge struct field types from j2k
Fixes AVOption type mismatch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index e2765fecfc..e70b5cef00 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -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 |