avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 23:23:56 +0000 (01:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 May 2013 23:24:47 +0000 (01:24 +0200)
commit0b42631641d998e509cde6fa344edc6ab5cb4ac8
tree7c3bfa66577a26d3e155fab9b8062fb98630063c
parentc649ecb3b2321a8f48b6a6bca06e0156c8b38fc7
avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec

This fixes at least one out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/jpeg2000dec.c