jpeg2000dec: merge struct field types from j2k
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 23:47:22 +0000 (01:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 May 2013 01:10:07 +0000 (03:10 +0200)
commit5dbbb762e58c8c410cfdfbb25d89f8b8314164e7
tree8724bac591792bf6c6d03b380d6f3e951d5696aa
parent89f472b3ee2f4af6cbae01b18042505a1d2b094a
jpeg2000dec: merge struct field types from j2k

Fixes AVOption type mismatch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dec.c